LRが効くように
弾薬バー
Merge remote-tracking branch 'origin/master２' into master２

Conflicts:
	extern.h