クリスマス
Merge branch 'develop' into v2/test2

Conflicts:
	temp.txt
testを追加
Merge branch 'v2/test2' into develop