222

2
Merge remote-tracking branch 'origin/master'

Conflicts:
	hw2/instructor/src/edu/nyu/cs/cs2580/DocumentIndexed.java
	hw2/instructor/src/edu/nyu/cs/cs2580/IndexerInvertedCompressed.java