added some search functionality.
Merge branch 'master' of github.com:ilangray/massive-octo-batman