.
Merge branch 'master' of https://github.com/Webbdesignkurser/website

Conflicts:
	_includes/head.html