Merge remote-tracking branch 'origin/correct_branch_names' into generate_manylinux_wheels

Author: DanShort12

.github/workflows/python.yml

@@ -2,9 +2,9 @@ name: python_package
 
 on: 
   push:
-    branches: [ master ]
+    branches: [ main, develop ]
   pull_request:
-    branches: [ master ]
+    branches: [ main, develop ]
   release:
     types:
       - created