inital commit
fixing conflicts
Merge branch 'master' of github.com:dudeunix67/chef-repo

Conflicts:
	LICENSE
	README.md

	deleted:    LICENSE
	deleted:    README.md