1218
Merge branch 'master' of https://github.com/liuin/cocos2D-test

Conflicts:
	README.md