Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main
authorlukel495 <lukel495@su00-101.ad.liu.se>
Sat, 11 Nov 2023 14:35:28 +0000 (15:35 +0100)
committerlukel495 <lukel495@su00-101.ad.liu.se>
Sat, 11 Nov 2023 14:35:28 +0000 (15:35 +0100)

Trivial merge