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

Conflicts:
	src/Config.java
stuff