Added pg to Gemfile
Merge branch 'master' into production