忽略掉Gemfile.lock文件
修改cucumber测试的环境
忽略database.yml文件
更新cucumber测试
排课第一部分完工
modify Gemfile
添加测试cucumber
Merge branch 'feature/teaching' into develop

Conflicts:
	Gemfile.lock
	log/development.log
删除Gemfile.lock和development.log