a
Merge branch 'filling-in-layout' of https://github.com/snowmi/railstutorial.jp into filling-in-layout