basic timers added
merging timer
Merge branch 'master' of https://github.com/mkennedy3000/x265