added svg
added .DS_Store to gitignore
removed .DS_Store
removed conflict