FIXED timer
Merge branch 'master' of gitorious.oit.duke.edu:partypal/partypal