map screen
Merge branch 'master' of https://github.com/arka-g/penguincarpool

Conflicts:
	.idea/workspace.xml