Merge branch 'develop' into v2/test
クリスマス
testを追加
Merge branch 'v2/test' of https://github.com/ts-uehara-masayoshi/test into v2/test

Conflicts:
	temp.txt
Merge branch 'v2/test' into develop