initial commit
Merge github.com:XuyangZhang/puppet