test
Merge remote-tracking branch 'origin/master'

Conflicts:
	Innlevering 2 - XML + HTML og CSS 2.0/bendik.html