ggyy
Merge remote-tracking branch 'origin/danny'

Conflicts:
	.DS_Store
ya
aa
aa
Merge branch 'danny'

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/cjworld/24StoryBooks
test conflict
aaa
3344
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
update background