beginning to update UI to battle mode
merge conflicts
more changes to battle UI, changed player to move with WASD
Merge branch 'master' of https://github.com/danmartelly/SugarRush
more fixes to battle UI
Merge branch 'master' of https://github.com/danmartelly/SugarRush
more changes to battle UI, also took out the health label in battle code
merge conflicts
Merge branch 'master' of https://github.com/danmartelly/SugarRush
changed the battle UI, also made the enemy health bar flicker upon being attacked
changed the battle UI, also made the enemy health bar flicker upon being attacked
Merge branch 'master' of https://github.com/danmartelly/SugarRush
added hovering over crafting house state
Merge branch 'master' of https://github.com/danmartelly/SugarRush