Change SpaceShip
Merge branch 'Ziheng-Deng'

Conflicts:

SpaceTrek.xcodeproj/project.xcworkspace/xcuserdata/gunnersdeng.xcuserdat
ad/UserInterfaceState.xcuserstate