feat(git ignore): ignore .DS_Store files
Merge remote-tracking branch 'upstream/develop' into develop