shoppingcart
Merge branch 'master' of https://github.com/destivn/PetStore

Conflicts:
	PetStore/PetStore.csproj