changed logo
Merge branch 'change-logo'