not sure
Merge branch 'master' of https://github.com/sdc50/geotimeline

Conflicts:
	GeoTimeline/geotimeline/templates/timemap.html