fix bug
Merge remote-tracking branch 'origin/master' into chihiro_testing
fix network bug
Merge remote-tracking branch 'origin/master' into chihiro_testing

Conflicts:
	testprogram
add collision detection