first commit
Merge branch 'master' of https://github.com/sgamerw/cocos2d-x
first commit