test
Merge branch 'master' of https://github.com/sistanaka/test

Conflicts:
	test1.txt