added quaternions and gimbal lock warning in kinematics.py
fixed merge conflict