ticket:1 Fixed models! updated templates, fixtures, settings, urls; Done
Merge branch 't1_profile_home' of https://github.com/wlame/django-cc-project into t1_profile_home

Conflicts:
	django_hello_world/hello/models.py
fixed model; added new migration