merge conflict resolution
more merge conflict resolution
fixes prices for updating items
updates add to cart buttons and qty boxes on items page
Merge branch 'master' of https://github.com/tyrbo/the_pivot
updates site design
can add and delete admins from a supplier
merge conflicts and failing tests
sets text boxes to activate update button on edit pages
test supplier admin functionality fixes #117
fixes failing tests
Merge pull request #120 from chadbrading/master

adds jQuery to forms and updates design
supplier can update description fixes #45
merge conflicts
fixes #115 supplier index shows categories
Merge pull request #122 from allisonlarson/supplier_edit

Supplier edit
Fixes merge conflicts