5566
1199
Merge branch 'danny'

Conflicts:
	.DS_Store

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