working onshopping cart
Merge branch 'master' of github.com:czhu12/ams
adding a bunch fo updates