bug fix
resolve conflict
Merge branch 'master' of github.com:oveis/Web_Search_Engine

Conflicts:
	conf/engine.conf.template