added conflicting second line to foo.txt
Merge branch 'master' of https://github.com/pherold/Test

Conflicts:
	foo.txt