added a comment
altered comment
Merge remote-tracking branch 'origin/master'