modified:   testfile.txt
	modified:   testfile.txt
	new file:   New Text Document.txt
	modified:   testfile.txt
Merge branch 'master' of https://github.com/sunnycomes/test

Conflicts:
	testfile.txt

	deleted:    testfile.txt