add line 3
Merge branch 'master' into B1

Conflicts:
	Readme.txt