Commiting .DS_Store

I tried to just commit in command line, but it said i needed to merge
DS, so I am doing it in the app.
Commit/Sync

I am commiting this so I can synk my branch.
merged robot design conflicts