the starter kit from Chef
Merge remote-tracking branch 'origin'

Conflicts:
	README.md

First time committing the "chef-repo" folder