Add CommentTracker class to project

CommentTracker class now included in the project. This file was
forgotten in previous commits. Oops.
Merge remote-tracking branch 'github/master'