making timer for main screen
Merge remote-tracking branch 'origin/master'
finishing up timer
Merge remote-tracking branch 'origin/master'
working timer with hard coded test interval