new images added
more images addedd
Revert "more images addedd"

This reverts commit 28dee8977e1eda1bc83d2740347884849bc66d40.
Revert "new images added"

This reverts commit 99bc6a2a96d8fb4caf6e3c802970f7d52ca807da.
Revert "Revert "more images addedd""

This reverts commit d2e0246e6d5ed5633c67c5eed72174a1afe44cf7.
Revert "Revert "new images added""

This reverts commit 4e423f334ea921c7d4b1129071c8e373228dbd78.
commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Model/ShoppingCart.php
	View/viewCart.php