a
Merge branch 'master' of github.com:Eagles2F/MapReduceAndDFS

Conflicts:
	MapReduceAndDFS/src/dfs/HandleDFSClientReq.java
Merge branch 'master' of github.com:Eagles2F/MapReduceAndDFS