Merge branch 'main' of https://github.com/csc309-winter-2022/team58 into develop

2022-04-09 15:33:31 -05:00
parent c345cea888 f65fbd70aa
commit fd916a8d63
70 changed files with 36502 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -348,4 +348,4 @@ sketch
 # Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option)

 server/public/
-server/mongo-data/
+server/mongo-data/