Merge pull request #13 from opentechinstitute/lisa_search

Fix merge conflict, integrate search engine
combine search types