ticket#4 for 42-test-ollavrova (Create template-context-processor that adds django.settings to the context)
fix static
add test
fix static
Merge branch '42-ollavrova#4'

Conflicts:
	django_hello_world/settings.py