Merge branch 'master' of https://github.com/6Shan/Shopping

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/6Shan/Shopping.git