tja
Merge branch 'master' of github.com:eivindjs/programmeringsoppgave