conflict fixed
back to conflict merge
ランキングから映画情報詳細
Merge pull request #55 from ScrumPBL/harada_detail_conflict

Harada detail conflict