from test2 folder
Merge branch 'master' of https://github.com/Kazuto88/test

Conflicts:
	test.txt