change database to psql
Merge branch 'change_db'