Merge branch 'master' of https://github.com/bsettle/hangmanbs.git