test step1
Merge branch 'master' of https://github.com/masahiko-kato/test into test_step1

Conflicts:
	test.txt
Merge pull request #4 from masahiko-kato/test_step1

Test step1