modify
modify
Merge branch 'master' of https://github.com/xuesong123/javascript-template

Conflicts:
	node_modules/webserver/lib/webserver.js