create something simple
Merge branch 'master' of github.com:/markllama/origin-puppet