Merge branch 'master' of https://github.com/front/tryggehandel

Conflicts:
	wp-content/themes/childOfyellowproject/style.css
Fix merge conflicts