updata
Merge branch 'master' of https://github.com/sadanwawa/Eliminating-the-ball

Conflicts:
	EliminationBalls/Classes/scence/MainUILayer.cpp

EliminationBalls/proj.ios/EliminationBalls.xcodeproj/project.xcworkspace
/xcuserdata/yingchen.xcuserdatad/UserInterfaceState.xcuserstate