search function landing page
conflict resolved
Merge pull request #20 from bshore01/search-function

search function landing page