initial changes
Merge https://github.com/eheb/chef-repo

Conflicts:
	README.md