sandra's files (map, marker, scrolling)
Merge branch 'master' of https://github.com/mrpin/taxi-service

Conflicts:
	.idea/workspace.xml