Reducer<-Mapper
Merge remote-tracking branch 'origin/master'

Conflicts:
	MapReduceFramework/src/lxu/lxmapreduce/task/TaskInProgress.java