add test.conf
add test1.conf
deleted test.conf
deleted test1.conf
Merge branch 'master' of github.com:fabbie/puppet_test
add halo.con
modified puppet.conf
remove halo.con
fabbie.conf