排课第一部分完工
modify Gemfile
添加测试cucumber
Merge branch 'feature/teaching' into develop

Conflicts:
	Gemfile.lock
	log/development.log
删除Gemfile.lock和development.log
排课完成
delete something
删除三个文件
Merge branch 'feature/zhaoxl' into develop