javascript file
trying to merge
Merge pull request #54 from krauzer/timer

Timer