a
マージの意味わかってきた？
Revert "画面遷移"

Conflicts:

BTO.xcodeproj/project.xcworkspace/xcuserdata/ami.xcuserdatad/UserInterfa
ceState.xcuserstate

BTO.xcodeproj/project.xcworkspace/xcuserdata/oderatakashi.xcuserdatad/Us
erInterfaceState.xcuserstate
やめて
Merge branch 'kotetaka'

Conflicts:

BTO.xcodeproj/project.xcworkspace/xcuserdata/ami.xcuserdatad/UserInterfa
ceState.xcuserstate