alphabetized categories and items
basic search function working
correctly display error message
basic search done, with view reflecting results
Fixes merge conflicts
Merge branch 'search-function'