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

Conflicts:
	GeoTimeline/GeoTimeline.sqlite
playing with editing the timeline
turn off edits