temp commit
Merge remote-tracking branch 'origin/master'
pull commit
Merge remote-tracking branch 'origin/master'
Timer fixed. History sort of working. Weird bug.