Rapport utfylt
Merge branch 'master' of github.com:iseneirik/INF1010