change config file.
Merge branch 'master' of github.com:Eagles2F/MapReduceAndDFS
Merge branch 'master' of github.com:Eagles2F/MapReduceAndDFS

Conflicts:
	MapReduceAndDFS/src/mapreduce/master/MapReduceJob.java
	MapReduceAndDFS/src/mapreduce/master/WorkerManagerServer.java