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

Conflicts:
	1-0catalog.html
	1-1catalog-bmw.html
	css/screen.css