13-0vopros, 9-0contacts
Merge branch 'master' of https://github.com/coderiver/dillerhall

Conflicts:
	css/screen.css
	js/init.js
	js/min/init.min.js