last minute changes
Merge branch 'master' of github.com:caspervdpoll/hangman_2