this time?
new
Merge branch 'master' of https://github.com/hdo272/ship

Conflicts:
	Ship/Ship.xcodeproj/project.xcworkspace/xcuserdata/Annie.xcuserdatad/UserInterfaceState.xcuserstate
	Ship_1/Ship_1.xcodeproj/project.xcworkspace/xcshareddata/Ship_1.xccheckout