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 feature-not-reflecting-comment
2 jobs for feature-not-reflecting-comment in 42 seconds (queued for 1 second)