settings.py
Merge branch 'master' of https://github.com/fergalmoran/dss