Updated the shopping cart and moved it into the nav bar.
Merge branch 'master' of https://github.com/stevenng308/Component-Based-Term-Project