modified:   test.txt
	modified:   New Text Document.txt
	modified:   New Text Document.txt
	modified:   New Text Document.txt
	modified:   New Text Document.txt
	modified:   New Text Document.txt
Merge branch 'master' of https://github.com/sunnycomes/test into sunny

Conflicts:
	New Text Document.txt

	modified:   New Text Document.txt
	modified:   test.txt