增加了猜书游戏页面，比较简单，后期要修改
与远程master分支合并
Merge branch 'master' into develop

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/kindleren/kandouwo/MainActivity.java
	app/src/main/res/layout/activity_main.xml
Merge branch 'master' into develop
加个空格
Merge pull request #2 from foxcode7/develop

张斌的pr第一次