time処理入れる途中。
Merge branch 'develop' of https://github.com/yasai-juice111/cocos2d-training-team into feature/kawabata

Conflicts:
	proj.ios/.DS_Store
Merge branch 'develop' of https://github.com/yasai-juice111/cocos2d-training-team into feature/kawabata
Merge complete