first branch added
modification of the first branch
Base file removed
Merge remote-tracking branch 'origin/master' into FirstBranch

Conflicts:
	Base
added text
Merge remote-tracking branch 'origin/FirstBranch'
New text