Setup RSpec
Merge branch 'gemfile'
Run rake db:migrate
Run rails generate controller welcome index
Update config/routes.rb
Merge branch 'routes'