removed node.js
Merge remote-tracking branch 'upstream/master'

Conflicts:
	desc.txt