Merge pull request #2 from yuki3738/05_controller_basics

05 controller basics