Change the formula used to calculate initial NPC health
Merge remote-tracking branch 'zini/master' into combat