fix
Merge branch 'master' of https://github.com/gaiyongbo/poolGame
score
Merge branch 'master' of https://github.com/gaiyongbo/poolGame

Conflicts:
	poolGameEx/poolGameEx.xcodeproj/project.pbxproj
	poolGameEx/poolGameEx/HelloWorldLayer.mm
fix
Merge branch 'master' of https://github.com/gaiyongbo/poolGame

Conflicts:
	poolGameEx/poolGameEx/HelloWorldLayer.mm