initial commit
Merge branch 'master' of https://github.com/drgeb/Learning-chef

Conflicts:
	README.md
initial commit