zoom
Merge branch 'master' of https://github.com/csterling/maptime-demo

Conflicts:
	index.html