adding timer
Merge pull request #25 from scottsbaldwin/timer

adding timer and unit tests