no message
Merge branch 'master' of https://github.com/MrYD/Xmas

Conflicts:
	ハッカソン/DxFramework/bin/Debug/resource/img/スコープ.png