Hello Git World
Merge branch 'master' of https://github.com/ThuF/TDD-Hangman.git into conflicting_branch_ThuF