rails scaffold setup
rails scaffold
Merge branch 'master' into rails_setup
scaffold