Merge branch 'master' of github.com:apealive-cookbooks/gitzone

Conflicts:
	metadata.rb
Merge branch 'master' of github.com:apealive-cookbooks/gitzone

Conflicts:
	metadata.rb