second commit
iMerge branch 'master' of github.com:amar266/puppettest2