Changes to IR sensor and motors, merged changes