test
test
Merge branch 'master' of https://github.com/aozaki/ruby

Conflicts:
	test.txt