Re populate db
Up manual
Merge branch 'default' into julie
typos
Merge branch 'default' of https://github.com/cbretton/SINF2255 into default
xav->def
updat