Merge branch 'torpedoRotationEvan'