update setting
Merge branch 'django-temp' of https://github.com/tab262/cs673 into django-temp