Beginning oppgave 1
added some functionality
started oppgave 2
started oppgave3
sf
testing stom
Merge branch 'refs/heads/Oppgave3'
Merge branch 'refs/heads/Oppgave1'