by Patrik
Merge branch 'master' of https://github.com/Liveto110/liveto110-theme

Conflicts:
	css/styles.css