adding file changes to pass foodcritic tests including CINK
Merge branch 'foodcritic-tests' into next

Conflicts:
	attributes/default.rb
	metadata.rb