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

2 jobs for incorrect-scope in 17 minutes and 43 seconds (queued for 2 seconds)