Dagatal popover stærra og klukkan
Merge branch 'master' of https://github.com/nori/football-website

Conflicts:
	public/stylesheets/style.css