Switched from sqllite3 to postgresql
Merge remote-tracking branch 'origin/master'