修改描述
Merge branch 'master' of https://github.com/yhexie/AppScene

Conflicts:
	README.md