Merge branch 'master' of gitlab.stud.idi.ntnu.no:carljgu/Wargames

4 jobs for master in 45 seconds