adding more results for searchView
adding fix for merge confilt
Merge pull request #33 from GJST-Capstone/gregory

approved