Fished mostly
Merge branch 'master' of https://github.com/sgeisenh/440MapReduce

Conflicts:
	src/framework/Client.java