timer stuff
fix conflict
more timer
Merge branch 'master' of https://github.com/occdevcamp/RTCDeck
Timer stuff
Merge branch 'master' of https://github.com/occdevcamp/RTCDeck