original commit
Merge branch 'master' of https://github.com/DanielGarrett/adventure_game