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

Conflicts:
	test.txt