removing puppet.conf file from versioning
Merge branch 'master' of https://github.com/brunoanjoz/puppet