Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main
authorarvsj277 <arvsj277@tlvm-4-2-4.ad.liu.se>
Thu, 9 Nov 2023 14:43:13 +0000 (15:43 +0100)
committerarvsj277 <arvsj277@tlvm-4-2-4.ad.liu.se>
Thu, 9 Nov 2023 14:43:13 +0000 (15:43 +0100)

Trivial merge