write in master
write in branch1
Merge remote-tracking branch 'remotes/origin/master' into branch1

Conflicts:
	README.md