merge with git://github.com/emilybache/GildedRose-Refactoring-Kata.git