Django project
Merge branch 'master' of https://github.com/KBratland/django_final