testing changes
Merge branch 'master' of github.com:binoybcompany/puppet_backup
Conflicts test
Merge branch 'master' of github.com:binoybcompany/puppet_backup
Test conflicted merge
Merge branch 'master' of github.com:binoybcompany/puppet_backup

Conflicts:
	manifests/nodes.pp