fixed some branch merging
Finished V1 of inputManager and made a small robotArithmetic upadate.