remove cocos2d file
Merge branch 'master' of https://github.com/LetGo/PopStar

Conflicts:
	.gitignore
add