ネットワーク最適化
fix network bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	source/Effect.cpp
	testprogram
add file