pg for production in gemfile
edit config assets
added rails_12factor gem
new gemfile lock
meow
Merge remote-tracking branch 'upstream/master'