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
.DS_Storeをコミットしないように設定
Merge branch 'develop' into feature/shibuya
add resources
Merge branch 'develop' of github.com:yasai-juice111/cocos2d-training-team into feature/cho
表示スケールサイズ、エフェクト表示の不具合を修正。
渋谷ステージを追加
Merge branch 'develop' into feature/shibuya

Conflicts:
	Classes/StageScene.cpp
	Classes/StartMenuScene.cpp