qq
Merge branch 'master' of
https://github.com/Zarmakuizz/articleanalysis.git

Conflicts:
	test/search_test.py