fix pos when phrase wiki doc
fix pos when phrase wiki file
Merge branch 'workspace' of https://github.com/XiaoConstantine/WebSearchEngine into workspace

Conflicts:
	HW2/conf/engine.conf
fix pos