some changes in other folder to solve merge conflicts

Author: Davda-James

video_cropper/video_cropper.py

@@ -11,8 +11,7 @@ def to_int(a, rel_to):
     If string contains "%" it converts it to a float and multiplies by rel_to
     EG: 50% -> 0.5*rel_to
     '''
-
-    if isinstance(a,int):
+    if isinstance(a, int):
         return a
     else:
         if '%' in a: