a
4
Merge branch 'master' of https://github.com/materone/MapVIewTest

Conflicts:

MapVIewTest.xcodeproj/project.xcworkspace/xcuserdata/tony.xcuserdatad/Us
erInterfaceState.xcuserstate