added timer
Merge branch 'master' of https://github.com/alisonkohl/cs147