Correct bugs/set anger/set hp
Merge remote-tracking branch 'origin/master'