removed xcuserdata
resolves merge conflict
ignores DS_Store and xcuserdata for real this time