Merge branch 'master' of https://github.com/t-taira/sample_app
Finish layout and routes
Merge pull request #3 from t-taira/filling-in-layout

Filling in layout
Merge pull request #4 from t-taira/develop

Develop