家长修改
Merge branch 'master' of github.com:scige/crystal

Conflicts:
	app/views/teachers/paper.html.haml