finished search engine
merging conflicts
Merge pull request #8 from aktse/master

finished search engine