Add shop scala
Shop change
Merge branch 'shopping_cart'