ds
Merge branch 'master' of https://github.com/irannabsb/chef-repo

Conflicts:
	.DS_Store
	cookbooks/.DS_Store