first commit
second commit
new class
Merge branch 'master' of git@github.com:xie1/testcode.git
code commit