Added mergeconflicts.txt file to lombardo branch
Merge branch 'lombardo'

Conflicts:
	TestRepoGIT/src/mergeconflicts.txt