From Eclipse
Merge branch 'master' of https://github.com/rtbenfield/TestRepo.git

Conflicts:
	AnotherTest.txt