меню
Merge branch 'master'
меню
меню
Merge branch 'alexey'
Merge branch 'github.com_alexey/master'
settings
тест
тест мастер
Merge branch 'work'

Conflicts:
	webshop/templates/base.html