first commit.
Merge branch 'master' of github.com:macococo/chef

Conflicts:
	.gitignore