test.java
add test.java
add test
remove test.java
Add test2.java
Remove testcommit/
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Add comments
new stuff
merge
Merge branch 'RuiShu-master'