Updated tasks on schedule
conflict
ditch the status reports
Merge branch 'master' of github.com:sdc50/geotimeline
ditch them again