fsdaf

fasf
Merge branch 'master' of https://github.com/KimOijerstedt/Kreative

Conflicts:
	front-page.php
	functions.php
	loop-about.php
	loop-landing.php