这是课程的更新
Merge branch 'master' of https://github.com/Maizhi/maizhi

Conflicts:
	templates/public/css/index.css