Timing
Merge branch 'master' of https://github.com/MadcowD/CS2420