jester modifications
rounding HP better, closes #389
closes #394
Merge remote-tracking branch 'origin/master'