Fixed the NPC issue where the HP would go over 100
Merge branch 'master' of https://github.com/ou-se-sp14-team-stallman/dungeon-crawl-jr.git