before merge
merge
Merge branch 'master' of github.com:ylyhlh/RGF_Hadoop