Commit to allow pull.
Merge branch 'master' of https://github.com/doctorgabi/Adventure-Game
Merge branch 'master' of https://github.com/doctorgabi/Adventure-Game
Fixes merge conflict.