start on combat state
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls
small changes to inventory, health bars and box set up in CombatState, need to fix QuickTime