implemented bumper and changed motor
merged