adding form
Merge branch 'master' of github.com:sdc50/geotimeline

Conflicts:
	GeoTimeline/geotimeline/templates/timemap.html