何回コミットせなあかんの？
ぐぬぬ
地図にマーカー表示できた

Conflicts:
	BTO.xcodeproj/project.pbxproj

BTO.xcodeproj/project.xcworkspace/xcuserdata/ami.xcuserdatad/UserInterfa
ceState.xcuserstate
Merge branch 'kotetaka' of github.com:yam-yanu/BTO into kotetaka

Conflicts:

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

BTO.xcodeproj/xcuserdata/ami.xcuserdatad/xcdebugger/Breakpoints.xcbkptli
st
	BTO/DataBaseAccess.h
	BTO/DataBaseAccess.m
	BTO/RootViewController.m