Added postgress setup
Merge branch 'postgress'
updated postgress settings