Update public code from private repo
Merge branch 'master' of https://github.com/coletivoEITA/chef-repo

Conflicts:
	Berksfile
	Berksfile.lock
	nodes/localhost.json
	roles/server.rb