Timeline Style
Merge branch 'master' of https://github.com/sdc50/geotimeline

Conflicts:
	GeoTimeline/geotimeline/static/js/timemap.js