Add testjs
Fix html 2
Merge pull request #4 from thanks2music/test

Test confrict ok2