added comments to all of the classes
fixed merge conflicts for adding comments to classes