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

Conflicts:
	js/prototype.html