Added new fancy logic
no message
Merge branch 'master' of github.com:shanemarks/EvilOverlord

Conflicts:
	unity/Assets/scripts/GameController.cs
	unity/ProjectSettings/Physics2DSettings.asset
Added scores and stuff
Merge branch 'master' of github.com:shanemarks/EvilOverlord

Conflicts:
	unity/Assets/scripts/player/Player.cs
Merge branch 'master' of github.com:shanemarks/EvilOverlord