test deleted
Merge branch 'dev2'

Conflicts:
	test.js