some changes
Merge branch 'master' of github.com:Qoes/Information-Retrieval-Project

Conflicts:
	index.html