new implementation of merge
Merge branch 'master' of https://github.com/patronpengiun/WebSearchEngine

update