Initial commit
Merge branch 'master' of https://github.com/iblake/test_shop

Conflicts:
	.gitignore