initial commit
Merge branch 'master' of github.com:crypticshell/chef-repo

Conflicts:
	.gitignore