added PG
modified for psql
Merge branch 'static-pages'