commit 3
Merge branch 'master' of https://github.com/tetsuya15/tutorial

Conflicts:
	test.txt