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

Conflicts:
	EliminationBalls/proj.android/bin/EliminationBalls.apk

EliminationBalls/proj.android/bin/dexedLibs/libcocos2dx-9bd5ca788f63ceee
58c8cc021b0d888e.jar
	EliminationBalls/proj.android/bin/resources.ap_