Merge remote-tracking branch 'origin/master'

Conflicts:
	GameJamUnityProject/Assets/Scenes/MainMenu.unity
	GameJamUnityProject/GameJamUnityProject-csharp.sln
	GameJamUnityProject/GameJamUnityProject.sln

testy test
Merge branch 'master' of https://github.com/Dwarfius/SummerUniGameJam2014