test
Merge branch 'master' into ver_0.5_mastar_marge

Conflicts:
	juno/最後のプレゼン.pptx