up
Merge branch 'master' of github.com:javachen/hadoop-install