Updated cookups_main with functional routes,  search and results page
Merge branch 'master' of https://github.com/umass-cs-326/team-cinnamon-crickets

Updated cookups_main with functional routes, search, and results pages from cookups dev
Merge branch 'master' of https://github.com/umass-cs-326/team-cinnamon-crickets
Fixed git merge issues