Remove .DS_Store
Merge remote-tracking branch 'origin/gitignore' into resolve_urls