diff --git a/.idea/.idea.CNSA-212-Personal-CAS/.idea/workspace (conflicted copy 2024-02-08 103827).xml b/.idea/.idea.CNSA-212-Personal-CAS/.idea/workspace (conflicted copy 2024-02-08 103827).xml
deleted file mode 100644
index 7f94821..0000000
--- a/.idea/.idea.CNSA-212-Personal-CAS/.idea/workspace (conflicted copy 2024-02-08 103827).xml
+++ /dev/null
@@ -1,567 +0,0 @@
-
-
-
- CNSA-212-Personal-CAS/CNSA-212-Personal-CAS.csproj
- Chapter 5/Chapter 5.csproj
- Chapter6/Chapter6.csproj
- Database/Database.csproj
- ElementaryMathematics/ElementaryMathematics.csproj
- MDI/MDI.csproj
- MidtermProject/MidtermProject.csproj
- ScratchBook/ScratchBook.csproj
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {
- "associatedIndex": 2
-}
-
-
-
-
-
-
-
-
-
- {
- "keyToString": {
- ".NET Project.Chapter 5.executor": "Run",
- ".NET Project.Chapter6.executor": "Run",
- ".NET Project.ElementaryMathematics.executor": "Run",
- ".NET Project.MidtermProject.executor": "Run",
- "ASKED_ADD_EXTERNAL_FILES": "true",
- "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "SHARE_PROJECT_CONFIGURATION_FILES": "true",
- "git-widget-placeholder": "master",
- "ignore.virus.scanning.warn.message": "true",
- "node.js.detected.package.eslint": "true",
- "node.js.detected.package.tslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "nodejs_package_manager_path": "npm",
- "settings.editor.selected.configurable": "preferences.sourceCode.C#",
- "vue.rearranger.settings.migration": "true"
- },
- "keyToStringList": {
- "rider.external.source.directories": [
- "C:\\Users\\eggman\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\DecompilerCache",
- "C:\\Users\\eggman\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\SourcesCache",
- "C:\\Users\\eggman\\AppData\\Local\\Symbols\\src"
- ]
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1706796774658
-
-
- 1706796774658
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1706797379671
-
-
-
- 1706797379671
-
-
-
- 1706797394109
-
-
-
- 1706797394109
-
-
-
- 1706797559129
-
-
-
- 1706797559129
-
-
-
- 1706797581738
-
-
-
- 1706797581738
-
-
-
- 1706798013331
-
-
-
- 1706798013331
-
-
-
- 1706798242767
-
-
-
- 1706798242767
-
-
-
- 1706798280854
-
-
-
- 1706798280854
-
-
-
- 1706799382777
-
-
-
- 1706799382777
-
-
-
- 1706799462794
-
-
-
- 1706799462794
-
-
-
- 1706799486722
-
-
-
- 1706799486722
-
-
-
- 1706800098192
-
-
-
- 1706800098192
-
-
-
- 1706800231565
-
-
-
- 1706800231565
-
-
-
- 1706801326431
-
-
-
- 1706801326431
-
-
-
- 1706802855299
-
-
-
- 1706802855299
-
-
-
- 1706803393304
-
-
-
- 1706803393304
-
-
-
- 1706836755156
-
-
-
- 1706836755156
-
-
-
- 1706839510778
-
-
-
- 1706839510778
-
-
-
- 1706879011265
-
-
-
- 1706879011265
-
-
-
- 1706880990593
-
-
-
- 1706880990593
-
-
-
- 1706887870980
-
-
-
- 1706887870980
-
-
-
- 1707174420577
-
-
-
- 1707174420577
-
-
-
- 1707190211941
-
-
-
- 1707190211941
-
-
-
- 1707225564837
-
-
-
- 1707225564837
-
-
-
- 1707225756324
-
-
-
- 1707225756324
-
-
-
- 1707266649846
-
-
-
- 1707266649846
-
-
-
- 1707310690301
-
-
-
- 1707310690301
-
-
-
- 1707313377301
-
-
-
- 1707313377301
-
-
-
- 1707314164182
-
-
-
- 1707314164182
-
-
-
- 1707316220557
-
-
-
- 1707316220557
-
-
-
- 1707319748726
-
-
-
- 1707319748726
-
-
-
- 1707400016987
-
-
-
- 1707400016987
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Database/Database (conflicted copy 2024-02-08 100248).csproj b/Database/Database (conflicted copy 2024-02-08 100248).csproj
deleted file mode 100644
index 55504fc..0000000
--- a/Database/Database (conflicted copy 2024-02-08 100248).csproj
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {5DEFB1D0-F129-4E6E-A090-69ED8FF0E5BA}
- WinExe
- Database
- Database
- v4.7.1
- 512
- true
- true
-
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Form
-
-
- frmDisplay.cs
-
-
-
-
- frmDisplay.cs
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
- Designer
-
-
- True
- Resources.resx
-
-
- SettingsSingleFileGenerator
- Settings.Designer.cs
-
-
- True
- Settings.settings
- True
-
-
-
-
-
-
-
\ No newline at end of file