added encoder
Merge branch 'gyro'