changed db to postgres, preparing to push to heroku
fixed merge conflicts