添加路径,显示首页和错误页面
Merge remote-tracking branch 'origin/master'

Conflicts:
	control/views.py
修改views merge