Working!
Merge branch 'master' of https://github.com/Fonzie2k/puppetmaster

Conflicts:
	manifests/nodes/puppetagent.lyteo.net.node
	manifests/site.pp