add test2 word
merge master 1 and 2
master2 has been modified
test
test1 txt master 2 add java file
test again
test tambah public c file
test 1 modified 1
added test2.txt
test 2 now added to branch master 2
modified test2 with the one in branch master2
created test3.txt
Merge branch 'master2'