Commit 1 Frederik
Merge branch 'master' of https://github.com/nickosv/Gruppe-6-Projekt-3.git