Modify ReadMe.text, Add change 1 & 2
Branch1 change 1

Add one line "Branch1 change 1"
Master change 1

Add line "Master chagne 1"
Merge branch 'branch1'

Conflicts:
	ReadMe.txt
Master change 2

Add line "Master change 2"