a

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

Conflicts:
	.gitignore
	MapVIewTest.xcodeproj/project.pbxproj

MapVIewTest.xcodeproj/project.xcworkspace/xcuserdata/tony.xcuserdatad/Us
erInterfaceState.xcuserstate
	MapVIewTest/en.lproj/MainStoryboard_iPhone.storyboard
a

a