Merge branch 'dev' into main

Author: ducksoupdev

.github/workflows/master.yml .github/workflows/main.yml.github/workflows/master.yml renamed to .github/workflows/main.yml

@@ -2,7 +2,7 @@ name: Deploy to Github pages
 on:
   push:
     branches:
-      - master
+      - main
 jobs:
   deploy:
     runs-on: ubuntu-latest