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