Merge branch 'second'

Conflicts:
	CocoApp6-4.xcodeproj/project.pbxproj