Fixed bad merge
Finished setSpeed function