no message
Merge branch 'master' of https://github.com/kyang126/homework3

Conflicts:
	js/cartTest.js
	shopping.html
no message