Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1
authorLukel495 <lukas.eliasson@live.se>
Mon, 11 Dec 2023 10:22:41 +0000 (11:22 +0100)
committerLukel495 <lukas.eliasson@live.se>
Mon, 11 Dec 2023 10:22:41 +0000 (11:22 +0100)

Trivial merge