adding hiera.yaml
adding hiera.yaml
adding hiera.yaml
expanding to support all my modules
Merge branch 'master' into development

Conflicts:
	Puppetfile
committing development Puppetfile
Merge branch 'development' into testing

Conflicts:
	Puppetfile
resolving differences
Merge branch 'testing' into production

Conflicts:
	Puppetfile
fixing prod