Assignment 5 Finished#40

Toreke wants to merge 2 commits intoSQATLab2016:masterSQATLab2016/GildedRose:masterfrom

Toreke:masterToreke/GildedRose:masterCopy head branch name to clipboard