smarts
Merge branch 'master' of github.com:kylab0617/chef-repo

multiple conficting updates
removed .chef