added test1.txt
not really sure what I did here
added another file
edited test1.txt
Merge branch 'test2'

Conflicts:
	test1.txt
Merge branch 'test1'

Conflicts:
	test1.txt