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

Conflicts:
	unity/Assets/scenes/splash_screen.unity
	unity/Assets/scripts/initScores.cs