Merge branch 'dev'

# Conflicts:
#	.github/workflows/build_deploy_master.yml
#	.github/workflows/build_dev.yml
#	package-lock.json
#	public/android-chrome-192x192.png
#	public/android-chrome-512x512.png
#	public/apple-touch-icon.png
#	public/favicon-16x16.png
#	public/favicon-32x32.png
#	public/favicon.ico
#	src/components/Discord.tsx
#	src/components/Footer.tsx
#	src/components/Hero.tsx
#	src/components/Navbar.tsx
#	src/components/Team.tsx
#	src/data/Projects.json
#	src/data/Team.json
#	src/images/pse-logo.svg
#	src/images/unirep.svg
#	src/index.css

.github/workflows/build_deploy_master.yml

@@ -3,10 +3,6 @@ name: Build & Deploy to Pages
 on:
   push:
     branches: [ master ]
-  pull_request:
-    types: [closed]
-    branches:
-      - master
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -28,7 +24,7 @@ jobs:
           npm run prerender
 
       - name: Deploy to gh-pages branch
-        uses: JamesIves/github-pages-deploy-action@v4.3.3
+        uses: JamesIves/github-pages-deploy-action@v4.4.3
         with:
           branch: gh-pages
           folder: build