commit konflikt
Merge branch 'master' of https://github.com/eivindjs/programmeringsoppgave.git