升级 ruby rails 版本
Merge branch 'master' of github.com:Wangzongcan/mynote

Conflicts:
	Gemfile.lock