为了生活
Merge branch 'master' of https://github.com/GHunique/CrazyGeography1

Conflicts:
	Classes/GameScene/AheadChapter.cpp
冲突