Serve tested and working
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/edu/nyu/cs/cs2580/IndexerInvertedCompressed.java