Added .DS_Store files to gitignore
Merge branch 'refs/heads/cluster'