branch merging
added pg and taps for heroku deploymet