Merge branch 'master' of https://github.com/johnston-gerald/hangman.git