tpott/butter-star — pull request #70 by rohanhalliyal (2013-06-07 16:43:40+00:00)
Title: Timer adds 35 sec to game instead.

- 35 seconds added at end off round
- 4 second delay at end of round instead of 5
- deleted this other random timer that was put in for some reason (hopefully this doesn't break anything) (was this an incomplete feature put into develop!?!?!? >_<)