Hangman, first attempt and refactored version.
resolved conflict
Merge pull request #1 from SViccari/git-conflict

Git conflict