Adding second merge message from branch1
Merging from 2nd Message in Branch1 to Master

Conflicts:
	Test.txt
Third  change in Branch1 moved to master