did MapCombiner
Merge branch 'master' of github.com:TheBottleSeller/MapReduceFacility

Conflicts:
	src/FacilityManager.java
	src/FacilityManagerImpl.java
	src/JobScheduler.java