Oppdatert
Merge branch 'master' of https://github.com/MalinAan/INF1000