added Cart.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/js/app.js