[Test2]　Test.txtを変更しました。
Merge branch 'master' of https://github.com/techlogics/practice
no message
Merge branch 'master' of https://github.com/techlogics/practice

Conflicts:
	Test.txt