PageRank + Numviews
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/edu/nyu/cs/cs2580/CorpusAnalyzer$Factory.class
	bin/edu/nyu/cs/cs2580/CorpusAnalyzer$HeuristicLinkExtractor.class
	bin/edu/nyu/cs/cs2580/CorpusAnalyzer.class
	bin/edu/nyu/cs/cs2580/CorpusAnalyzerPagerank.class
	bin/edu/nyu/cs/cs2580/Document$HeuristicDocumentChecker.class
	bin/edu/nyu/cs/cs2580/Document.class
	bin/edu/nyu/cs/cs2580/DocumentFull.class
	bin/edu/nyu/cs/cs2580/DocumentIndexed.class
	bin/edu/nyu/cs/cs2580/Evaluator$DocumentRelevances.class
	bin/edu/nyu/cs/cs2580/Evaluator.class
	bin/edu/nyu/cs/cs2580/Grader.class
	bin/edu/nyu/cs/cs2580/Indexer$Factory.class
	bin/edu/nyu/cs/cs2580/Indexer.class
	bin/edu/nyu/cs/cs2580/IndexerFullScan.class
	bin/edu/nyu/cs/cs2580/LogMinerNumviews.class
	bin/edu/nyu/cs/cs2580/QueryHandler$CgiArguments$OutputFormat.class
	bin/edu/nyu/cs/cs2580/QueryHandler$CgiArguments$RankerType.class
	bin/edu/nyu/cs/cs2580/QueryHandler$CgiArguments.class
	bin/edu/nyu/cs/cs2580/QueryHandler.class
	bin/edu/nyu/cs/cs2580/Ranker$Factory.class
	bin/edu/nyu/cs/cs2580/Ranker.class
	bin/edu/nyu/cs/cs2580/RankerFullScan.class
	bin/edu/nyu/cs/cs2580/ScoredDocument.class
	bin/edu/nyu/cs/cs2580/SearchEngine$Mode.class
	bin/edu/nyu/cs/cs2580/SearchEngine$Options.class
	bin/edu/nyu/cs/cs2580/SearchEngine.class
	src/edu/nyu/cs/cs2580/Document.java
	src/edu/nyu/cs/cs2580/DocumentIndexed.java
	src/edu/nyu/cs/cs2580/ScoredDocument.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/edu/nyu/cs/cs2580/CorpusAnalyzer$Factory.class
	bin/edu/nyu/cs/cs2580/CorpusAnalyzer$HeuristicLinkExtractor.class
	bin/edu/nyu/cs/cs2580/CorpusAnalyzer.class
	bin/edu/nyu/cs/cs2580/CorpusAnalyzerPagerank.class
	bin/edu/nyu/cs/cs2580/Document$HeuristicDocumentChecker.class
	bin/edu/nyu/cs/cs2580/Document.class
	bin/edu/nyu/cs/cs2580/DocumentFull.class
	bin/edu/nyu/cs/cs2580/DocumentIndexed.class
	bin/edu/nyu/cs/cs2580/Evaluator$DocumentRelevances.class
	bin/edu/nyu/cs/cs2580/Evaluator.class
	bin/edu/nyu/cs/cs2580/Grader.class
	bin/edu/nyu/cs/cs2580/Indexer$Factory.class
	bin/edu/nyu/cs/cs2580/Indexer.class
	bin/edu/nyu/cs/cs2580/IndexerFullScan.class
	bin/edu/nyu/cs/cs2580/LogMinerNumviews.class
	bin/edu/nyu/cs/cs2580/QueryHandler$CgiArguments$OutputFormat.class
	bin/edu/nyu/cs/cs2580/QueryHandler$CgiArguments$RankerType.class
	bin/edu/nyu/cs/cs2580/QueryHandler$CgiArguments.class
	bin/edu/nyu/cs/cs2580/QueryHandler.class
	bin/edu/nyu/cs/cs2580/Ranker$Factory.class
	bin/edu/nyu/cs/cs2580/Ranker.class
	bin/edu/nyu/cs/cs2580/RankerFullScan.class
	bin/edu/nyu/cs/cs2580/ScoredDocument.class
	bin/edu/nyu/cs/cs2580/SearchEngine$Mode.class
	bin/edu/nyu/cs/cs2580/SearchEngine$Options.class
	bin/edu/nyu/cs/cs2580/SearchEngine.class
	src/edu/nyu/cs/cs2580/Document.java
	src/edu/nyu/cs/cs2580/DocumentIndexed.java
	src/edu/nyu/cs/cs2580/ScoredDocument.java