merge conflict resolution
more merge conflict resolution
can add and delete admins from a supplier
merge conflicts and failing tests
test supplier admin functionality fixes #117
supplier can update description fixes #45
merge conflicts
fixes #115 supplier index shows categories
Merge pull request #122 from allisonlarson/supplier_edit

Supplier edit