adding some javascript for formating item descriptions and worked on item editing permissions
Merge branch 'master' into finished_cart
Merge branch 'master' into finished_cart
adding price to header next to shopping cart
Clearing the cart when invoice is paid. Also some stylistic changes
Adding Amazon aws and Paperclip to items.
Merge pull request #17 from danarch/Style_changes_and_clearing_the_cart

Style changes and clearing the cart
Merge branch 'master' into shoppersellertoggle
Merge pull request #18 from danarch/aws_for_items

Aws for items(Merge Second!) Rake db:migrate & bundle
Merge branch 'master' into shoppersellertoggle