hangman and todo
Merge pull request #72 from thomasdane/master

hangman and todo