reverted rmotors to no longer use encoders
fixed rmotors merge conflict