xxx
Merge branch 'origin/freeWalker86'
搞个冲突
准备冲突
Merge branch 'origin/freeWalker86'

Conflicts:
	js/regExp.html
测试git merge 冲突
测试git merge 冲突，当多个文件时
测试git merge 冲突，当修改多个文件时
Merge branch 'freeWalker86' of https://github.com/lvchengfei/LearnLab into freeWalker86

Conflicts:
	js/prototype.html