改为淘宝镜像
Merge branch 'master' of https://github.com/sun1752709589/rails

Conflicts:
	Gemfile