Configured heroku db
Merge branch 'marlon-config-db'