created framework for models and controllers
converted database to postgresql
fixed merge conflict