Merge remote-tracking branch 'origin/branch1'

Conflicts:
	readme2.txt
Merge remote-tracking branch 'origin/branch1'