Resource追加
追跡停止
edit
Merge branch 'develop' of https://github.com/yasai-juice111/cocos2d-training-team into feature/kawabata

Conflicts:
	proj.ios/cocos2dx-space-game.xcodeproj/project.pbxproj
Merge branch 'develop' of https://github.com/yasai-juice111/cocos2d-training-team into feature/kawabata
merge
マージして、動く状態に。
Merge branch 'develop' of https://github.com/yasai-juice111/cocos2d-training-team into feature/kawabata
KawabataScene追加
川端ステージ追加
Merge branch 'develop' of https://github.com/yasai-juice111/cocos2d-training-team into feature/kawabata
add resources
Merge branch 'develop' of github.com:yasai-juice111/cocos2d-training-team into feature/cho
マージしたときのエラーを修正
add licence
Merge commit '73137ddf4063d9e063771e91f3c6ecc99972e31f' into feature/kawabata
KawabataEnemy追加：EnemyShipのprivate変数の属性をprotectedに。
.DS_Storeを無視するようにしようとしたが、ならない。
KawabataEnemy修正：弾を打つ方向のバリエーション追加、弾を打つ間隔を調整。
Xcode project update