added a comment
Merge branch 'master' of https://github.com/daditto/laughing-octo-hipster