adding shopping basket
Merge branch 'shopping_basket'
merging