Settings
settings.py
Merge pull request #32 from tsheasha/develop

Develop
Merge branch 'develop' of github.com:tsheasha/SkillAcademy into develop