delete
edit js
Merge branch 'b1
add test

Conflicts:
	test.js