1198221804

修改文件
Merge branch 'master' of https://github.com/LCW523LFL/Order-test

Conflicts:
	app/views/welcome/index.html.erb