Searching Contacts
fix merge conflicts
Merge pull request #7 from brain-murphy/brian-branch

Brian branch