Health bar and combat logic fixes
merge
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls