Fjernet merge fails
Merge branch 'master' of https://github.com/GufCab/Semester-Projekt---PC-Program
Merge branch 'master' of https://github.com/GufCab/Semester-Projekt---PC-Program