added ds files to gitignore
Merge commit 'e2176cb8e2478c49ffd5f4607a8c39548fc94c8d'

Conflicts:
	.gitignore