修改异常处理的js文件名
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md