RigibBody修正
一時Commit
障害物オブジェクト設置

指定場所はベタ打ち。つらい。
Merge branch 'TakuyaDev'

Conflicts:

proj.ios/ScrollAndPickUp.xcodeproj/project.xcworkspace/xcuserdata/gpn.xc
userdatad/UserInterfaceState.xcuserstate
Merge branch 'master' of https://github.com/iichin0708/ScrollAndPickUp

Conflicts:

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