Merge develop
Merge develop
add image file
Merge branch feature/cho
Merge branch feature/kawabata
都度生成されるファイルの追跡を停止
add resources androidkun
Merge branch 'develop' of github.com:yasai-juice111/cocos2d-training-team into feature/cho
add resources file
背景、プレイヤー、敵のベースクラスを追加。
追加ファイルのプロジェクト追加。
Merge branch 'develop' of github.com:yasai-juice111/cocos2d-training-team into develop

Conflicts:
	proj.ios/cocos2dx-space-game.xcodeproj/project.pbxproj
add resources
Merge branch 'develop' of github.com:yasai-juice111/cocos2d-training-team into feature/cho
Merge branch 'develop' of https://github.com/yasai-juice111/cocos2d-training-team into feature/kawabata

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