clean workspace
rm test.js
Merge branch 'dev'

merge