Merge pull request #6 from bemyhre/add_search

Add search
staging for the evening
Merge branch 'master' into add_search