update 8/1/14
Merge branch 'master' of github.com:OhMyLumpinGlob/Hangman