aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
Merge branch 'jerry'

Conflicts:
	.DS_Store
	.gitignore

JnD_24books.xcodeproj/project.xcworkspace/xcuserdata/cjworld.xcuserdatad
/UserInterfaceState.xcuserstate

JnD_24books.xcodeproj/project.xcworkspace/xcuserdata/dannynash.xcuserdat
ad/UserInterfaceState.xcuserstate
aaa