gem lock
Merge branch 'master' of https://github.com/zhzenghui/YueProject

Conflicts:
	soucecode/yue_app/Gemfile.lock