new commit of web.js
Merge branch 'master' of https://github.com/rafitikva/node-js-sample

Conflicts:
	index.html
	web.js