potential conflict
Merge branch 'master' of github.com:pyrat/deployment_recipiez

Conflicts:
	lib/recipiez/version.rb
	recipes/deployment_recipiez.rb
0.6.10