Initial commit
Merge branch 'master' of github.com:caspii/puppetmaster

Conflicts:
	.gitignore