гитигнор Димы
Merge branch 'master' of github.com:pvlm/VKShop

Conflicts:
	.gitignore