current state
Merge branch 'master' of https://github.com/Somesingman/PennApps_Fall_2013
solving merge problems
adding duration/counter variables
Merge branch 'master' of https://github.com/Somesingman/PennApps_Fall_2013