999
Merge branch 'danny'

Conflicts:
	.DS_Store
mader
.DS_Store banished!
aaa
5566
1199
Merge branch 'jerry'

Conflicts:
	JnD_24books/p2_father.h
Merge branch 'danny'

Conflicts:
	.DS_Store

JnD_24books.xcodeproj/project.xcworkspace/xcuserdata/cjworld.xcuserdatad
/UserInterfaceState.xcuserstate
	JnD_24books/p2_father.h
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
Merge branch 'jerry'
Merge branch 'jerry'
Merge branch 'jerry'
Merge branch 'jerry'
Merge branch 'jerry'
update framework