adding comments to timers.h
Merge branch 'timers'
example merge conflict