adds some timer libraries

fixes merge concerns

adds some timer libraries
Merge pull request #13 from trosper/master

Adds some timer libraries