忽略掉Gemfile.lock文件
修改cucumber测试的环境
忽略database.yml文件
更新cucumber测试
Merge branch 'feature/teaching' into develop

Conflicts:
	Gemfile.lock
	log/development.log
删除Gemfile.lock和development.log
更新cucumber测试
删除日志文件
删除三个文件
Merge branch 'feature/zhaoxl' into develop