deleted:    README.md
	new file:   test2.txt
Merge branch 'master' of https://github.com/sunnycomes/test2 into su
	modified:   test2.txt
	new file:   test2.txt
Merge branch 'su'

Conflicts:
	test2.txt

	modified:   test2.txt
	modified:   test2.txt
	modified:   test2.txt