commit
Merge branch 'master' of https://github.com/cjworld/24StoryBooks

Conflicts:

JnD_24books.xcodeproj/project.xcworkspace/xcuserdata/dannynash.xcuserdat
ad/UserInterfaceState.xcuserstate
	JnD_24books/p2_father.h
lll