,,
Merge branch 'master' of https://github.com/YusiZhang/DSProj3.git

Conflicts:
	DSProj3/src/dfs/FileTransfer.java
Merge branch 'master' of https://github.com/YusiZhang/DSProj3.git
Merge branch 'master' of https://github.com/YusiZhang/DSProj3.git

Conflicts:
	DSProj3/src/harrypotter.txt_blk0
Merge branch 'master' of https://github.com/YusiZhang/DSProj3.git
mapred
Merge branch 'master' of https://github.com/YusiZhang/DSProj3.git