lagt inn kart
Merge remote-tracking branch 'origin/master'

Conflicts:
	BackboneMiniprosjekt/Scripts/views/operasjonRomView.js
	BackboneMiniprosjekt/index.html