cocos2d-x
Merge branch 'week3' of https://github.com/jwvg0425/ProjectArthas into week3