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

Timer
Revert "Timer"
Merge pull request #56 from red-spotted-newts-2014/revert-54-timer

Revert 54 timer