ya
aa
aaa
Merge branch 'jerry'
update background
aaa
Merge branch 'jerry'
update ccbi
add all story page in
Merge branch 'jerry'
updated
update subtitle
Merge branch 'jerry'
Merge branch 'jerry' of https://github.com/cjworld/24StoryBooks into jerry
update framework
Merge branch 'jerry'
Merge branch 'master' of https://github.com/cjworld/24StoryBooks

Conflicts:
	JnD_24books/Resources/ccbi/.DS_Store