favorite機能プルリクする前
conflict fixed
Merge pull request #43 from YusukeKinoshita/UIchange

U ichange