Front end
Merge branch 'master' of https://github.com/KosmosOgKaos/ljosanott_theme

Conflicts:
	styles/styles.css
Front end
Front end