layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	site/index.php
	site/styles/styles.css