add conf and setup
Merge branch 'master' of github.com:zjmwqx/hadoop-learn