first commit
new commit
second commit
Merge branch 'master' of github.com:timsheng/capbeta