icons
removed .DS_Store
merge
icons