siyangwang
was
Merge branch 'master' of https://github.com/patronpengiun/WebSearchEngine

Conflicts:
	hw/instructor/bin/edu/nyu/cs/cs2580/Evaluator.class
	hw/instructor/bin/edu/nyu/cs/cs2580/QueryHandler.class
	hw/instructor/bin/edu/nyu/cs/cs2580/SearchEngine.class
	hw/instructor/src/edu/nyu/cs/cs2580/Document.class
	hw/instructor/src/edu/nyu/cs/cs2580/Evaluator.class
	hw/instructor/src/edu/nyu/cs/cs2580/Evaluator.java
	hw/instructor/src/edu/nyu/cs/cs2580/Index.class
	hw/instructor/src/edu/nyu/cs/cs2580/LinearRanker.class
	hw/instructor/src/edu/nyu/cs/cs2580/NumviewsRanker.class
	hw/instructor/src/edu/nyu/cs/cs2580/PhraseRanker.class
	hw/instructor/src/edu/nyu/cs/cs2580/QLRanker.class
	hw/instructor/src/edu/nyu/cs/cs2580/QueryHandler.class
	hw/instructor/src/edu/nyu/cs/cs2580/Ranker.class
	hw/instructor/src/edu/nyu/cs/cs2580/ScoredDocument.class
	hw/instructor/src/edu/nyu/cs/cs2580/SearchEngine.class
	hw/instructor/src/edu/nyu/cs/cs2580/VectorHelper.class
	hw/instructor/src/edu/nyu/cs/cs2580/VsmRanker.class