change to postgresql and heroku
Merge remote-tracking branch 'origin/master'