timer broken
Merge branch 'master' of https://github.com/AVatch/Google-24-Hr-Hackathon