bilde
Merge branch 'master' of https://github.com/petnwil/Eksamensoppgave--webprosjekt2013

Conflicts:
	hjem.html
bilde
Merge branch 'master' of https://github.com/petnwil/Eksamensoppgave--webprosjekt2013