Reconnect logic with latest blimp.py code

blimp.py

@@ -8,10 +8,6 @@ def direction_translation(dir1, dir2, dir3, dir4):
     new_dir3 = 0
     new_dir4 = 0
 
-<<<<<<< HEAD
-=======
-
->>>>>>> master
     if dir1 == '+':
         new_dir1 = 2
     else:
@@ -73,7 +69,7 @@ class Blimp:
             time.sleep(0.2)
         self.ws = create_connection(self.target)
         return True
-        
+
     def get_LidarDist1(self):
         return 0
 
@@ -130,7 +126,7 @@ class Blimp:
             spin = "TURNING LEFT"
             if (pwm3 > pwm4):
                 thrust = "BACKWARD"
-            elif (pwm3 == pwm4):    
+            elif (pwm3 == pwm4):
                 thrust = "NONE"
             else:
                 thrust = "FORWARD"