Merge branch 'master' of gitlab.stud.idi.ntnu.no:andreajj/tdt4242-base into inconsistent-naming

2 jobs for inconsistent-naming in 17 minutes and 37 seconds