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

Conflicts:
	index.html