...
Merge branch 'master' of github.com:jjtorroglosa/my-boxen

Conflicts:
	Puppetfile
	Puppetfile.lock
Fixed Puppetfile.lock