add
add
Merge branch 'master' of https://github.com/bizyukov/shopping_mall.git

Conflicts:
	logs.txt