Added timer, fixed check in/out
Merge branch 'master' of gitorious.oit.duke.edu:partypal/partypal