new gemfile.lock after adding pg
Merge branch 'master' of github.com:gangplank/gpfeeds