a

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

Conflicts:
	.gitignore