ticket:3 for 42-test-ollavrova2  - added page and created middleware
Merge branch 'master' into t3_middleware

Conflicts:
	django_hello_world/hello/forms.py
	django_hello_world/hello/models.py
	django_hello_world/hello/templates/hello/home.html
	django_hello_world/hello/tests.py
	django_hello_world/hello/views.py
	django_hello_world/settings.py
ticket 3: fix html
Merge branch 't1_contact'
Merge branch 'master' into t3_middleware
ticket3: create middleware