Updating metadata.rb
Merge branch 'master' of github.com:lherrada/chef

Conflicts:
	cookbooks/basic/metadata.rb