Moved master file to conf
Merge branch 'master' of github.com:pgtrex/saltstack
test