a
Merge branch 'TakuyaDev'

Conflicts:
	proj.ios/.DS_Store
画像の追加

Fieldおよび障害物
画面解像度固定
画面固定
コミット
画面解像度固定
画像追加
DS_Store
コミット
Merge branch 'master' into Kenji

Conflicts:
	Classes/HelloWorldScene.cpp
	proj.ios/.DS_Store
	proj.ios/ScrollAndPickUp.xcodeproj/project.pbxproj

proj.ios/ScrollAndPickUp.xcodeproj/project.xcworkspace/xcuserdata/gpn.xc
userdatad/UserInterfaceState.xcuserstate
AppDelegate.h Delete
画面解像度固定
DS_Store
Merge branch 'Kenji'

Conflicts:
	proj.ios/.DS_Store

proj.ios/ScrollAndPickUp.xcodeproj/project.xcworkspace/xcuserdata/gpn.xc
userdatad/UserInterfaceState.xcuserstate
場外で池ポチャ（敵）実装
DS_Store
場外で池ポチャ（敵）実装
DS_Store
Merge branch 'TakuyaDev'

Conflicts:

proj.ios/ScrollAndPickUp.xcodeproj/project.xcworkspace/xcuserdata/gpn.xc
userdatad/UserInterfaceState.xcuserstate