improvements
back
Merge https://github.com/GunpreetAhuja/DjangoApp2

Conflicts:
	shop/models.py~
	shop/urls.py~
	shop/views.py~