trying to uncommit the .DS_Store

for me mac
Merge branch 'master' of https://github.com/christoph2005/RiverRun

Conflicts:
	.DS_Store