Merge branch 'double'

main.cpp

@@ -5,13 +5,12 @@ using namespace std;
 int main()
 {
     cout << "Enter A and B: ";
-    int a, b;
+    double a, b;
     cin >> a >> b;
     cout << "A + B = " << a + b << '\n';
     cout<< "A - B = " << a - b << '\n';
     cout<< "A * B = " << a * b << '\n';
-<<<<<<< HEAD
     cout<< "A / B = " << a / b << '\n';
-=======
+    cout<< "max(A, B) = " << max(a, b) << '\n';
->>>>>>> 391e34f1bffbfd05c1ff4f4fd26786799f23a3bd
+    cout<< "min(A, B) = " << min(a, b) << '\n';
 }