did a bunch of work on the main menu
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2014

Conflicts:
	Assets/Resources/Spaceship.prefab