fix
Merge branch 'rails_girl' of github.com:ymzg/ymzg into rails_girl