added armor to player and removed a redundant function
Merge branch 'master' of https://github.com/lemrey/flaming-octo-meme