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

Merge branch 'master' of gitlab.stud.idi.ntnu.no:andreajj/tdt4242-base into testing/boundary-testing
2 jobs for testing/boundary-testing in 16 minutes and 50 seconds (queued for 1 second)