New Branch.  New Commit.
1st Commit on Feature Branch.
1st Commit for Hotfix
Merge branch 'New_Branch'

Conflicts:
	Test.txt
Ignore .org files
Merge branch 'hotfix/HotFix_1'

Conflicts:
	Test.txt
Merge branch 'feature/Feature_1'

Conflicts:
	Test.txt