Fixes
Merge branch 'master' of https://github.com/almyy/Programutvikling_team05