Merge branch 'master' of gitlab.stud.idi.ntnu.no:andreajj/tdt4242-base into testing/uc-4

2 jobs for testing/uc-4 in 17 minutes