From f48d4f1ec40b207fc81fc68ee9cfbf99afb3fe53 Mon Sep 17 00:00:00 2001
From: Daniel S <dsoto16@csuchico.edu>
Date: Wed, 10 Sep 2025 11:46:32 -0700
Subject: [PATCH 1/2] Resolved merge main issue

---
 main.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/main.cpp b/main.cpp
index 958ba61..60c29be 100644
--- a/main.cpp
+++ b/main.cpp
@@ -6,19 +6,21 @@ using std::cout;
 using std::endl;
 
 int main()
-{
+{   
+    cout << "Yo its me, lil d" << endl;
     cout << "Hi, please enter two whole numbers: ";
 
     int x,y;
 
     cin >> x >> y;
-    cout << "Addition: " << x + y << endl;
-    cout << "Subtraction: " << x - y << endl;
-    cout << "Multiplication: " << x * y << endl;
-    cout << "Division: " << x / y << endl;
-    cout << "Remainder: " << x % y << endl;
-    cout << "Square Root: " << sqrt(x) << endl;
-    cout << "Square: " << pow(x, y) << endl;
-
+    cout << x << "+" << y << "=" << x + y << endl;
+    cout << x << "-" << y << "=" << x - y << endl;
+    cout << x << "*" << y << "=" << x * y << endl;
+    cout << x << "/" << y << "=" << x / y << "with a remainder of " << x%y;
+    cout << "Square Root of " << x << " is " << sqrt(x) << endl;
+    cout << "Square Root of " << y << " is " << sqrt(y) << endl;
+    cout << x << "^" << y << "=" << pow(x, y) << endl;
+    
     return 0;
+
 }

From cbaa5379899f5dd3dd6dd87b9e36109a74180450 Mon Sep 17 00:00:00 2001
From: Daniel S <dsoto16@csuchico.edu>
Date: Wed, 10 Sep 2025 11:52:41 -0700
Subject: [PATCH 2/2] Resolved merge main issue

---
 .vscode/c_cpp_properties.json | 16 ++++++++++++++++
 .vscode/tasks.json            | 28 ++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 .vscode/c_cpp_properties.json
 create mode 100644 .vscode/tasks.json

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
new file mode 100644
index 0000000..b1f27e8
--- /dev/null
+++ b/.vscode/c_cpp_properties.json
@@ -0,0 +1,16 @@
+{
+    "configurations": [
+        {
+            "name": "Win32",
+            "includePath": [
+                "${workspaceFolder}/**"
+            ],
+            "defines": [
+                "_DEBUG",
+                "UNICODE",
+                "_UNICODE"
+            ]
+        }
+    ],
+    "version": 4
+}
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000..cab40ff
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,28 @@
+{
+    "tasks": [
+        {
+            "type": "cppbuild",
+            "label": "C/C++: gcc.exe build active file",
+            "command": "C:/msys64/ucrt64/bin/gcc.exe",
+            "args": [
+                "-fdiagnostics-color=always",
+                "-g",
+                "${file}",
+                "-o",
+                "${fileDirname}\\${fileBasenameNoExtension}.exe"
+            ],
+            "options": {
+                "cwd": "C:/msys64/ucrt64/bin"
+            },
+            "problemMatcher": [
+                "$gcc"
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "detail": "Task generated by Debugger."
+        }
+    ],
+    "version": "2.0.0"
+}
\ No newline at end of file