not working code
Merge branch 'master' of ssh://github.com/darrinwillis/distributedSystems

Conflicts:
	lab3/src/MasterServer.java
	lab3/src/Monitor.java
Makefile change
MapReduce compiles
MapReduce Working