Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main
authorlukel495 <lukel495@tlvm-4-2-4.ad.liu.se>
Wed, 8 Nov 2023 13:52:52 +0000 (14:52 +0100)
committerlukel495 <lukel495@tlvm-4-2-4.ad.liu.se>
Wed, 8 Nov 2023 13:52:52 +0000 (14:52 +0100)

Trivial merge