Fixed formatting

fixed nates terrible formatting
Changed main menu
Merge remote-tracking branch 'origin/Anthony'

Conflicts:
	Assets/Scene/Menu.unity
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/a0/a04752cb51ceb46999f8c370508fb204
	Temp/UnityTempFile-131a206d68f5a1d4da5e833005959cba
	Temp/UnityTempFile-1a855c4014749894086f314b0de3fd3a
	Temp/UnityTempFile-2e1104280796c7844b43fb7f7998f85e
	Temp/UnityTempFile-34e14e4485f79144cb4ba129ce301d24
	Temp/UnityTempFile-ceb2922b183b8644c8f924badd714013
	Temp/__EditModeScene