added test.js
added test.js
Merge branch 'testing'

Conflicts:
	test.js