Added cart feature. Paypal currently not working
Merge branch 'master' of https://github.com/jeriluma/Info-343-Group-Project

Conflicts:
	js/built-shop.js