switcher finalized
Merge branch 'master' of github.com:amritkarma/OpenCities

Conflicts:
	index.html