changed images
fixed merge conflicts
removed comments from gemfile

removed category description as required
Add cart and cart_items, test user cart interaction
Merge pull request #58 from ianderse/jessica

front end items and clean up
Merge pull request #60 from ianderse/luke

Luke
fix merge conflicts
fix merge conflicts