SPLASH!
Merge branch 'fixbranch' of https://github.com/Hoobler/MalmoMuseumProjekt into fixbranch