Update model
database config added (need to install postgres and create test and development databases locally and production on heroku)
pre-merge
merge changes