Added .DS_Store to ignore list in case it is not in the persons global list
Merge remote-tracking branch 'origin/master'