Adding sudoers and managing users
Merge branch 'master' of github.com:prestes/puppet

Conflicts:
	manifests/nodes.pp