configure staging
Merge branch 'master' of github.com:rabeloo/course_puppet

Conflicts:
	config/deploy/staging.rb