ピンの表示領域の変更
Merge remote-tracking branch 'origin/master' into master3
マップのピンを旗に変更
skip
skip
Merge branch 'genzaiti'

Conflicts:
	MySecondApp.xcodeproj/xcuserdata/araishuuji.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist