Updated custom gyro; should work now
Resolving merge conflicts