Trap can damage the player
Merge branch 'master' of https://github.com/Trevorr1/RogueGame.git