2. konflikt
Merge branch 'master' of https://github.com/Hellbear/COM03_Projekt