node.js example
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/nodejs/nodejs.colt