småfiks
Merge branch 'master' of https://github.com/olve123/Gruppe14

Conflicts:
	fix/oslokart/norskHtml/index.html