gitignore
Toptalks side
Mobiltilpasning
Litt mindre initiell zoom-faktor
ny partner
Merge branch 'master' into infoside

* master:
  ny partner
  Litt mindre initiell zoom-faktor
  Mobiltilpasning
  Toptalks side
  gitignore

Conflicts:
	.gitignore
	frontend/content/_layouts/default.html
	frontend/content/assets/css/screen.css