bugfixes
Merge branch 'master' of github.com:shanemarks/EvilOverlord
no message
Merge branch 'master' of github.com:shanemarks/EvilOverlord

Conflicts:
	unity/Assets/scenes/scenev0.3.unity