merging db
db schema
Changed DB to PostGres and connected to AWS