hitbox working
health now only drains when newly touching an enemy
Merge branch 'hitbox'
merge to master