commit
commit
Merge branch 'master' of
https://github.com/mw-ding/MapReduceFramework.git

Conflicts:
	src/JobTracker.java