ann
Merge branch 'refs/heads/master' into Annbranch
Changed the style of siderbar.
I added the shopping cart in top of index.html.