completed search bar, with tests
merge conflicts resolved
Merge branch 'search_bar'