forgot what changes were made
Merge branch 'master' of github.com:amritkarma/OpenCities

Conflicts:
	index.html
conflict resolved
finalized from my side
Merge branch 'master' of github.com:amritkarma/OpenCities

Conflicts:
	index.html
finalized the final map