Updated logo
Solved logo conflicts
Merge branch 'logo'