[ore]
Merge branch 'master' of https://github.com/ykamjp/my_dev_root

Conflicts:
	aaa.txt
[ore]