Lol

lol
Merge branch 'master' of https://github.com/MadSamlingen/madsamlingen-theme

Conflicts:
	.DS_Store