Initial Commit
Merge branch 'master' of github.com:gforghetti/chef-repo

Conflicts:
	README.md
test