主页面基本结构
主页面基本结构
Merge branch 'master' of https://github.com/ITBox/BabySay

Conflicts:
	.gitignore
	bin/AndroidManifest.xml
	bin/BabySay.apk
	bin/classes.dex
	bin/classes/cc/itbox/babysay/activities/GuideActivity.class
	bin/resources.ap_