Merge pull request #113 from letr0n/master

Added a stopwatch class with tests