wtf!
Merge remote-tracking branch 'origin/master'

Conflicts:
	fix/oslokart/norskHtml/index.html
Merge branch 'master' of https://github.com/olve123/Gruppe14