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

Conflicts:
	test1.txt
9

2