Merge branch 'SamirBranch2'

Conflicts:
	SpaceEnvoy.xcodeproj/project.pbxproj

SpaceEnvoy.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/Us
erInterfaceState.xcuserstate

SpaceEnvoy.xcworkspace/xcuserdata/Mari_Marr.xcuserdatad/UserInterfaceSta
te.xcuserstate
	SpaceEnvoy/Base.lproj/Main.storyboard
	SpaceEnvoy/GameScene.swift
	SpaceEnvoy/menuScene.swift
	SpaceEnvoy/menuView.swift