adding in comments
Merge remote-tracking branch 'origin/master'

* origin/master:
  adding a little more information