edite again master
Merge branch 'master' of https://github.com/herjason/test

Conflicts:
	test1.txt