add second line.
Merge branch 'master' of https://github.com/cheneylew/testGit

Conflicts:
	2.txt
add 3 line in testGit