unknown
Merge branch 'master' of https://github.com/sdc50/geotimeline
Added search bar to map.
Merge branch 'master' of https://github.com/sdc50/geotimeline

Conflicts:
	GeoTimeline/geotimeline/static/js/timemap.js
help
Committing changes for search bar again.