wall修正 CharStage修正
Merge branch 'master' of https://github.com/S-Yamamori/umeGame

Conflicts:
	Assets/Scene/game04.unity