начало магазина христианской продукции
Merge branch 'master' of https://github.com/greenteamer/shop into start

Conflicts:
	.gitignore
Merge branch 'start'
Merge branch 'work'