lol
Merge branch 'master' of https://github.com/jrods/comp199

Conflicts:
	myCart.php