.DS_Storeをコミットしないように設定
Merge branch 'develop' of https://github.com/yasai-juice111/cocos2d-training-team into feature/kawabata
merge