jill added some text file1
Merge branch 'master' of https://github.com/philopian/SourceTreeLearning

Conflicts:
	file1.txt
file 2