Shopping Cart Working - Styling needs to be added
Merge origin/master