conflict
Merge branch 'master' of https://github.com/zyli5313/MapReduce.git

Conflicts:
	src/cmu/ds/mr/mapred/TaskScheduler.java