Exercis http://djangobook.py3k.cn/2.0/chapter07/: After simple demonstrate
Merge branch 'master' of github.com:buendiya/mysite

Conflicts:
	books/views.pyc
	mysite/urls.pyc
	test.log
Finish: 编写Contact表单
Delete test.log