change Gemfile.lock
Merge remote-tracking branch 'origin/rails-pg' into rails

Conflicts:
	Gemfile.lock
更改为mysql