e
Merge branch 'master' of git@github.com:YusiZhang/DSProj3.git
Merge branch 'master' of git@github.com:YusiZhang/DSProj3.git
Merge branch 'master' of git@github.com:YusiZhang/DSProj3.git
ee
Merge branch 'master' of git@github.com:YusiZhang/DSProj3.git

Conflicts:
	DSProj3/src/ConfigFile.txt
jj
Merge branch 'master' of git@github.com:YusiZhang/DSProj3.git

Conflicts:
	DSProj3/src/mapred/Job.java
oo
Merge branch 'master' of git@github.com:YusiZhang/DSProj3.git
qq
Merge branch 'master' of git@github.com:YusiZhang/DSProj3.git

Conflicts:
	DSProj3/src/mapred/Job.java
eee
Merge branch 'master' of git@github.com:YusiZhang/DSProj3.git

Conflicts:
	DSProj3/src/ConfigFile.txt
	DSProj3/src/mapred/Job.java
Merge branch 'master' of git@github.com:YusiZhang/DSProj3.git
jj
Merge branch 'master' of git@github.com:YusiZhang/DSProj3.git
ee
Merge branch 'master' of git@github.com:YusiZhang/DSProj3.git

Conflicts:
	DSProj3/src/communication/Message.java
	DSProj3/src/mapred/Job.java
	DSProj3/src/node/ClientMain.java
Merge branch 'master' of git@github.com:YusiZhang/DSProj3.git

Conflicts:
	DSProj3/src/mapred/Job.java