init commit
Merge branch 'master' of https://github.com/john-qin/puppet