added search and category functionality
Merge branch 'master' of https://github.com/davidjfreedman/FinalProject