a
Merge branch 'master' of https://github.com/eijisatoh/develop into localmaster

Conflicts:
	test.txt
test