HOLY SHIT IT WORKS KINDA
Fixes merge conflict and updates hit points
Merge pull request #22 from varunrau/joel/fina

all it needed was a little _space = space