asd
Merge branch 'master' of github.com:johandahlgren/JohanMDahlgren

Conflicts:
	components/page.php
	style/style.css