fix problem
fixproblem2
Merge branch 'master' of https://github.com/Master109/SortingGame

Conflicts:
	SotringGame.spritebuilder/SpriteBuilder Resources/MainScene.ccb