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

Conflicts:
	.gitignore