change logo branch
conflict fixed
Merge pull request #52 from YusukeKinoshita/logo

Logo