Ignore some files
Merge branch 'master' of https://github.com/SunLightJuly/quick-cocos2d-x

Conflicts:
	.gitignore