master
Merge branch 'master' of github.com:pigram86/puppet-work