starting new timer
Merge branch 'Zach2'