commit aaa.txt
a new commit
Merge branch 'master' of github.com:yjyang/002