mm
Merge branch 'master' of https://github.com/nsamsdev/simpleCart

Conflicts:
	cart.php
fix