Fix part.7
Merge branch 'master' of https://github.com/kzjnet/search

Conflicts:
	src/search.h