update
Merge branch 'master' of https://github.com/streecktg/chef-demo

Conflicts:
	README.md