more puppet
Merge remote-tracking branch 'origin/master'

Conflicts:
	Puppet/Lab1/Manifests/site.pp