rails generate controller index index
Merge remote-tracking branch 'origin/master'