removed a bunch of garbage from a comment
Merge remote-tracking branch 'origin/master'