Merge branch 'master' of https://github.com/Kodekompaniet/kodekompaniet.no

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

Fikset Espen siden - ta en titt!
Kreft

asd
Merge remote-tracking branch 'origin/master'