some changes done in timer.html
modified timer.html manually due to merge conflicts