Merge branch 'UC-4' of https://gitlab.stud.idi.ntnu.no/vegarms/tdt4242-base into UC-4

1 job for UC-3 in 28 seconds (queued for 25 seconds)