modified:   test.txt
	new file:   test2.txt
Merge branch 'master' of https://github.com/michael3639/gittest

Conflicts:
	test.txt