test
Merge branch 'test_jsnode'

Conflicts:
	console.js
jfjjfjf