small things
Merge branch 'master' of https://github.com/michellejzh/132-Group-40
trying timeout function
testing a timer