Update by Ding
Merge branch 'master' of https://github.com/pc660/map_reduce.git
Merge branch 'master' of https://github.com/pc660/map_reduce.git