Merge branch 'master' of...

Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/idatt2106-2024-07/backend into feat/model-classes

 Conflicts:
	.gitlab-ci.yml