Merge branch 'japanese' of github.com:yasslab/railsguides.jp into japanese