my version
hw2
aa
Merge branch 'workspace' of github.com:XiaoConstantine/WebSearchEngine into workspace

Conflicts:
	HW2/conf/engine.conf
	HW2/src/edu/nyu/cs/cs2580/IndexerInvertedOccurrence.java
	HW3/src/edu/nyu/cs/cs2580/ByteAlignCompress.java
	HW3/src/edu/nyu/cs/cs2580/IndexerInvertedCompressed.java
	HW3/src/edu/nyu/cs/cs2580/IndexerInvertedOccurrence.java
Merge branch 'workspace' of github.com:XiaoConstantine/WebSearchEngine into workspace

Conflicts:
	HW3/src/edu/nyu/cs/cs2580/IndexerInvertedOccurrence.java
	HW3/src/edu/nyu/cs/cs2580/Prf.java
	HW3/src/edu/nyu/cs/cs2580/QueryHandler.java
	HW3/src/edu/nyu/cs/cs2580/RankerComprehensive.java
Merge branch 'workspace' of github.com:XiaoConstantine/WebSearchEngine into workspace

Conflicts:
	HW3/src/edu/nyu/cs/cs2580/Bhattacharyya.java
	HW3/src/edu/nyu/cs/cs2580/IndexerInvertedCompressed.java
	HW3/src/edu/nyu/cs/cs2580/IndexerInvertedOccurrence.java
	HW3/src/edu/nyu/cs/cs2580/PorterStemmer.java
	HW3/src/edu/nyu/cs/cs2580/Prf.java
	HW3/src/edu/nyu/cs/cs2580/QueryHandler.java