added maxHealth and setHealth override in Person
added heal method to player
Merge remote-tracking branch 'origin/master' into lockhart