clean
merge
Added damage/knockback to all player and enemy attacks
misc changes
added leveling and skill upgrade system
Merge branch 'developer' of https://github.com/jcollins2014/Project into developer

Conflicts:
	Assets/Scenes/GameScene.unity
	Assets/Scripts/Game/Player/InputHandler.cs
	Assets/Scripts/Interface/GameGUI.cs
	ProjectSettings/InputManager.asset
Patched hao's merge with developers branch

Should run fine. Current controls are keyboard controls
added wave system + some balancing with knockback
fixed aura attack and tweaked player settings for balancing
added enemy upgrade stuff
Added difficulty system and progressively harder enemy upgrades with minor balancing
Fixed some upgrade/ui bugs
Fixed more upgrade/ui bugs..
Online Highscore, Enemy Spawner/Bouncer
Merged w/ developer
fixed all player attacks after enemy collision fix introduced some player attack inconsistencies
Merge branch 'developer' of https://github.com/jcollins2014/Project into hao