Changed position of timeline and moved logo
Merge branch 'master' of https://github.com/drgloo/Burlap

Conflicts:
	GeoJSON/Dummy_Logo.png