Initial Commit
Merge https://github.com/krillin6/puppet