add search function
add search function
Merge branch 'master' of github.com:ericlundmark/ESH