Finished branch
Merge pull request #1 from disconsented/hurt_resistance

Finished branch