updated search
Merge pull request #21 from amychiu/amy/development2

updated search