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

Conflicts:
	css/screen.css
	index.html
	js/common.js
	sass/_common.sass
	sass/_main.sass