ステージ周りの機能拡張
Merge branch 'develop' of github.com:yasai-juice111/cocos2d-training-team into develop

Conflicts:
	Classes/EnemyShip.h
	Classes/PlayerShip.h
	Classes/StageScene.h
	Classes/StartMenuScene.cpp
プロジェクトファイルにファイルを追加。
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
Merge branch 'develop' of github.com:yasai-juice111/cocos2d-training-team into develop

Conflicts:
	Classes/EnemyShip.h
	Classes/PlayerShip.h
	proj.ios/cocos2dx-space-game.xcodeproj/project.pbxproj
Merge branch 'develop' of github.com:yasai-juice111/cocos2d-training-team into develop

Conflicts:
	proj.ios/cocos2dx-space-game.xcodeproj/project.pbxproj