Adding branding assets
Resolving DS-store merge conflicts