Merge kinda
Merge branch 'develop' of https://github.com/Hoobler/MalmoMuseumProjekt into develop