Added additional comment markers.
Added note about Contributing section.
Merge branch 'master' into copyright

Conflicts:
	attributes/default.rb
	recipes/default.rb