first commit
Merge branch 'master' of github.com:hpzf89/cocos2d-x-training