moving timer
Merge pull request #1 from arandilopez/master

moving timer