timer stuff
Merge branch 'master' of https://github.com/marcochiang/hackbeanpot
Merging commit timer and other stuff