commit
Merge branch 'master' of https://github.com/mred2735/cocos2dGameStudy

Conflicts:
	RunningMan/RunningMan/Classes/GameScene.m