cart.js
update .gitignore
添加到购物车
Merge remote-tracking branch 'origin/frontend'

Conflicts:
	src/public/assets/js/cart.js
Merge branch 'master' of https://github.com/YTM/foo