settings
Merge branch 'master' of https://github.com/petrov-vova/goods
merge changes;
Merge branch 'master' of https://github.com/petrov-vova/goods