Development Puppetfile
Master Puppetfile
done
Merge branch 'development'

Conflicts:
	Puppetfile
Merge branch 'production'
synchronizing the control module
setting up master branch
adding demo module
adding demo module
adding demo module
added roles & profiles
adding roles & profiles
adding roles & profiles
adding hiera data
Merge branch 'master' into development
Merge branch 'development' into testing
Merge branch 'testing' into production