Merge branch 'master' of https://github.com/Graulf/LIA_wordpress

Conflicts:
	wp-content/themes/catch-kathmandu-child/style.css
försöker fixa konflikt

…