update
Merge branch 'master' of https://github.com/liujian890508/MonsterJump

Conflicts:
	Classes/HeroSprite.cpp
	Classes/HeroSprite.h