hey!!
Merge branch 'master' of https://github.com/stan4git/15640_MapReduce

# By cater1986
# Via cater1986
* 'master' of https://github.com/stan4git/15640_MapReduce:
  MapperRunner update
  MapperOutputCollector

Conflicts:
	src/mapred/ReduceRunner.java