changes to the search bar
fixed conflicts
fixed conflicts
Merge pull request #8 from fiery-skippers-2014/greg

changes to the search bar