adding some javascript for formating item descriptions and worked on item editing permissions
Merge branch 'master' into finished_cart
Merge pull request #15 from danarch/stripe

Stripe error handling refactoring
Merge branch 'master' into finished_cart
Set up changing role - function only
role changing looks nicer now but ugly code
adding price to header next to shopping cart
Add a bit of javascript to check radio button
Merge branch 'master' into shoppersellertoggle
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
Merge pull request #19 from danarch/shoppersellertoggle

Shoppersellertoggle
resolve merge conflicts in schema