added basic ability to search
Merge branch 'master' of https://github.com/zturchan/391