Renamed EntityAttributes to CombatAttributes
Merge branch 'master' of https://github.com/DevPrice/TextAdventure.git