чат
Merge branch 'alexey'

Conflicts:
	webshop/static/css/style.css
чат