Attempt to fix merge conflicts

Trying to uncorrupt Xcode data files

Conflicts:
	ThinkLocalFirst.xcodeproj/project.pbxproj
	ThinkLocalFirst.xcodeproj/project.xcworkspace/xcuserdata/chris.xcuserdatad/UserInterfaceState.xcuserstate
	ThinkLocalFirst.xcodeproj/xcuserdata/chris.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
	ThinkLocalFirst/en.lproj/MainStoryboard.storyboard