added first file
added a new line
added node-js-sample
Merge branch 'master' of https://github.com/pitC/myrepo

Conflicts:
	web.js
Fixed web.js