Tutorial 3 模板和url
Merge branch 'master' of https://github.com/hzgnjupt/Git-Test.git

Conflicts:
	mysite/db.sqlite3
	mysite/mysite/urls.py
	mysite/polls/views.py