deleted:    test.js
Merge branch 'master' of https://github.com/LaPatatePourrie/nodejs

Conflicts:
	test.js