1.4
Merge branch '1.3'

Conflicts:
	CPrimer.xcodeproj/project.pbxproj
	CPrimer.xcodeproj/project.xcworkspace/xcshareddata/CPrimer.xccheckout

CPrimer.xcodeproj/project.xcworkspace/xcuserdata/Chris.xcuserdatad/UserI
nterfaceState.xcuserstate