changes
Merge branch 'master' of https://github.com/xiang7/HadoopProject