revision:9 finish part 2 with a question
Merge branch 'master' of github.com:mostevercxz/writingFirstDjango

Conflicts:
	firstDjangoApp/firstDjangoApp/settings.pyc
	firstDjangoApp/polls/admin.py
	firstDjangoApp/polls/admin.pyc
	firstDjangoApp/polls/models.py
	firstDjangoApp/polls/models.pyc
	tips_archive