Merge branch 'master' of github.com:73log/rails_study_sample-app
Merge branch 'modeling-users'