Static and template folders
Merge branch 'master' of github.com:Kazanz/django-quickstart