Merge branch 'develop' into #1360-HaregAderie-credits

Author: RChandler234

src/frontend/src/pages/CreditsPage/CreditsPage.tsx

@@ -99,9 +99,11 @@ const CreditsPage: React.FC = () => {
     { name: 'Peter Moise', color: '#FF0000' },
     { name: 'Srihari Raman', color: '#FF2400' },
     { name: 'Kaiyang Zheng', color: '#FFFF00' },
+    { name: 'Waasif Mahmood', color: '#114a13' },
     { name: 'Matthew Wang', color: '#c657f2' },
     { name: 'Sharon Yang', color: '#ed8a5f' },
-    { name: 'Hareg Aderie', color: '#34b46c'}
+    { name: 'Hareg Aderie', color: '#34b46c'},
+    { name: 'Kevin Polackal', color: '#800080' }
   ];
 
   const snark = ['Add your name!', "Shouldn't you do it yourself?", 'Seriously', 'go', 'do', 'it'];