rapport work
Merge branch 'master' of https://github.com/esiqveland/prosjektoppgave
small changes