Merge branch 'sign-up'
Add Ruby version to Gemfile for Heroku
Merge branch 'master' into sign-up
Update to latest version of Ruby, and Rails