changes 4 from Master
Merge remote-tracking branch 'origin/FirstBranch'

Conflicts:
	MyFileMaster1.txt
Merge remote-tracking branch 'origin/FirstBranch'

Conflicts:
	MyFileMaster1.txt
Merge remote-tracking branch 'origin/FirstBranch'

Conflicts:
	MyFileMaster1.txt
Merge branch 'master' into FirstBranch