lkala
sdf
Merge branch 'refs/heads/Oppgave3'
Merge branch 'refs/heads/Oppgave2'

Conflicts:
	myfirstproject/src/main/java/no/mo/myfirstproject/Oppgave2.java