fb1 - First commit in feature branch 1
Merge branch 'FeatureBranch1' into Branch1

Conflicts:
	Git.txt