.Ds removed
Merge branch 'master' of github.com:irannabsb/syseng-scripts

Conflicts:
	.DS_Store
	chef/.DS_Store