changed
changed
Merge branch 'master' of https://github.com/himeshsameera/smartshopping

Conflicts:
	.gitignore
addItem
Merge branch 'master' of https://github.com/himeshsameera/smartshopping