first commit
second comment
Merge branch 'master' of github.com:cindyrise/workgit