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

Conflicts:
	config.txt
Merge branch 'master' of github.com:TheBottleSeller/MapReduceFacility