Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main
authorlukel495 <lukel495@tlvm-4-4-1.ad.liu.se>
Thu, 9 Nov 2023 14:44:25 +0000 (15:44 +0100)
committerlukel495 <lukel495@tlvm-4-4-1.ad.liu.se>
Thu, 9 Nov 2023 14:44:25 +0000 (15:44 +0100)

Trivial merge