added stuff
Merge branch 'refs/heads/Oppgave1'