settings
settings
attempting workaround idea
Merge branch 'master' of heroku.com:ancient-temple-3664

Conflicts:
	companionpages/companionpages/settings.py