Update by helm
Merge branch 'master' of https://github.com/stan4git/15640_MapReduce

Conflicts:
	src/mapred/JobTracker.java