layout
Merge branch 'master' of https://github.com/coderiver/lugano

Conflicts:
	css/screen.css