添加了gemfile.lock,*.sqlite3,development.log到git忽略
Merge branch 'master' of https://github.com/lclouds/cloud-lab

Conflicts:
	Gemfile.lock
	db/development.sqlite3
	log/development.log