Test changed a little bit. No big deal though
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/ca/mcgill/distsys/hbase96/inmemindexedclient/Test.java