fixed happiness and health over 100
Merge remote-tracking branch 'origin/master'