messing with puppetfile
still trying to figure out how puppetfile.lock updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	Puppetfile
	manifests/site.pp