meow
Merge remote-tracking branch 'upstream/master'
comment for rails_12factor gem
fix merge conflicts in gemfile