Medlem_6 update
Merge branch 'master' of https://github.com/melanki/MappeOppgave1