Merge .DS_Store
Merge branch 'master' into meyer30