s3
Merge branch 'master' into second

Conflicts:
	1 - Copy.TXT