Merge remote-tracking branch 'origin/feature-edit-main-page' into feature-edit-main-page

# Conflicts:
#	src/data/Flashcards.csv

Author: ThomasShimUoft

src/data/Flashcards.csv

@@ -28,4 +28,4 @@ term,definition,creationDate,flashcardId,belongsToId
 "Upcasting","Casting the type of a variable into its superclass.",2022-12-03T21:55:16.940754800,32,3
 "Private","Can only be accessed by code within the same class.",2022-12-03T21:55:28.372671100,33,3
 "Protected","Can only be accessed by code within the same class or within a class derived from the original.",2022-12-03T21:55:42.829787700,34,3
-"Variable shadowing","The same variable name is used in two different scopes.",2022-12-03T21:56:00.916802500,35,3
+"Variable shadowing","The same variable name is used in two different scopes.",2022-12-03T21:56:00.916802500,35,3