sb
store2
merge

Conflicts:
	.DS_Store
	SpaceTrek.xcodeproj/project.pbxproj