add master > README.md
おはよう日本
Merge branch 'master' into devel2

Conflicts:
	README.md
	test.py
test