Merge pull request #3 from cwallwork/timer

timer working, does not show yet
timer working and displaying