update settings.py and urls.py
Merge branch 'master' of https://github.com/mjhea0/django15-template