Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2014

Conflicts:
	Assets/Scripts/MainMenu.cs
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2014