fix bug collision
fix bug controls
Merge branch 'master' of github.com:CyberCRI/DsynBio

Conflicts:
	Assets/scenes/proto_04.unity