working with psql
Merge branch 'database'