Merge pull request #30 from tarynsauer/search

Search
Merge branch 'master' into search