Changed database settings to use env vars so that it can connect to PostgreSQL
Made changes to WSGI and Settings.py to enable PostgreSQL activation on Heroku
Updated database settings in settings.py
Updated settings.py for Heroku PostreSQL activation
Updated settings for Postgres on Heroku
Updated settings.py for Heroku
Update settings.py for Heroku PostgreSQL
Heroku database update
Copied heroku's settings.py exactly
Update settings.py for Heroku
cleaned up settings.py
Cleaned up settings.py
Updated settings.py
Fixed merge conflict in settings.py