minor changes
Merge branch 'master' of github.com:jimqi/CPSC-304-Project

Conflicts:
	shoppingcart.php