Merge branch 't1_profile_home'

Conflicts:
	django_hello_world/hello/migrations/0001_initial.py
	django_hello_world/hello/models.py