added a comment
Merge branch 'master' of github.com:newj/demo