Generate the Rails 4 application
Merge remote branch 'origin/master'