Just some notes and minor changes
Merge branch 'master' of https://github.com/sdc50/geotimeline

Conflicts:
	GeoTimeline/GeoTimeline.sqlite
Merge branch 'master' of https://github.com/sdc50/geotimeline

Conflicts:
	statusReports/week1.docx
Merge branch 'master' of https://github.com/sdc50/geotimeline