Added rails_12factor gem and updated Gemfile.lock
testing codeship
Merge branch 'working-branch'
update ruby version