massively overhauling the csseses
Merge pull request #22 from tiger-swallowtails-2013/refactorTimer

massively overhauling the csseses