Menu fixes
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls
Combat doesn't break