Did some things
Merge branch 'master' of github.com:almyy/Programutvikling_team05