after wrong try in CORS
Merge branch 'master' of
https://github.com/YuanyiYang/websearchengineone.git

Conflicts:
	src/edu/nyu/cs/cs2580/QueryHandler.java
	src/edu/nyu/cs/cs2580/Tfidf_Ranker.java