Up Manual
Merge branch 'default' into julie
Merge branch 'default' of https://github.com/cbretton/SINF2255.git into default