Merge branch 'master' of github.com:emilybache/Refactoring-Katas