upd
Merge branch 'master' of https://github.com/coderiver/dillerhall

Conflicts:
	css/screen.css
	sass/_inner.sass