stopwatch html and js
Merge branch 'Test-branch-merge-UI'