merge conflict resolution
more merge conflict resolution
can add and delete admins from a supplier
alphabetized categories and items
merge conflicts and failing tests
basic search function working
correctly display error message
basic search done, with view reflecting results
test supplier admin functionality fixes #117
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
Merge branch 'search-function'
starts implementing panels
fixes merge conflict
edits sidebar links and top navbar
styled navbar and footer