trolly's branch commit
branch2 second commit
test commot
Merge branch 'trollybranch2' into trollybranch
remove
commit test.c
clean trollybranch2
Merge branch 'trollybranch2' into trollybranch
commit master