Meira fancy dagatal
Merge branch 'master' of https://github.com/nori/football-website

Conflicts:
	views/partials/seasons.jade