fixed bug with timer once the task is delayed so that it doesn't automatically jump to -1 hour
Merge branch 'master' into dr-negHrsTimer
Merge branch 'master' into dr-negHrsTimer
Merge pull request #155 from StanfordHCI/dr-negHrsTimer

fixed bug with timer once the task is delayed