From 2559749198b8e14f3e0f9f5e35db17849d0765cc Mon Sep 17 00:00:00 2001
From: tsteelematc <tsteele@madisoncollege.edu>
Date: Thu, 9 Apr 2026 19:24:17 -0500
Subject: [PATCH 1/2] A second component for merge demos in Week 12...

---
 src/App.tsx                |  2 ++
 src/TsteeleComponent02.tsx | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 src/TsteeleComponent02.tsx

diff --git a/src/App.tsx b/src/App.tsx
index 53701d4..3bc9e2f 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,6 +1,7 @@
 import './App.css'
 import 'bootstrap/dist/css/bootstrap.min.css';
 import PizzaToppings from './PizzaToppings';
+import TsteeleComponent02 from './TsteeleComponent02';
 
 const App = () => {
 
@@ -12,6 +13,7 @@ const App = () => {
         React Components
       </h1>
       <PizzaToppings />
+      <TsteeleComponent02 />
     </div>
   );
 }
diff --git a/src/TsteeleComponent02.tsx b/src/TsteeleComponent02.tsx
new file mode 100644
index 0000000..9881ceb
--- /dev/null
+++ b/src/TsteeleComponent02.tsx
@@ -0,0 +1,34 @@
+import { Card } from 'react-bootstrap';
+import Spinner from 'react-bootstrap/Spinner';
+
+const TsteeleComponent02 = () => {
+  return (
+    <Card>
+        <Card.Body>
+            <Card.Title
+                className='mb-3'
+            >
+                Tom's Second Component
+            </Card.Title>
+            <Spinner animation="border" variant="primary" />
+            <Spinner animation="border" variant="secondary" />
+            <Spinner animation="border" variant="success" />
+            <Spinner animation="border" variant="danger" />
+            <Spinner animation="border" variant="warning" />
+            <Spinner animation="border" variant="info" />
+            <Spinner animation="border" variant="light" />
+            <Spinner animation="border" variant="dark" />
+            <Spinner animation="grow" variant="primary" />
+            <Spinner animation="grow" variant="secondary" />
+            <Spinner animation="grow" variant="success" />
+            <Spinner animation="grow" variant="danger" />
+            <Spinner animation="grow" variant="warning" />
+            <Spinner animation="grow" variant="info" />
+            <Spinner animation="grow" variant="light" />
+            <Spinner animation="grow" variant="dark" />
+        </Card.Body>
+    </Card>
+  );
+}
+
+export default TsteeleComponent02;
\ No newline at end of file

From d21f9a1b83e878a69aa83b321d29b5332539c129 Mon Sep 17 00:00:00 2001
From: tsteelematc <tsteele@madisoncollege.edu>
Date: Thu, 9 Apr 2026 19:25:41 -0500
Subject: [PATCH 2/2] Forgot margin

---
 src/TsteeleComponent02.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/TsteeleComponent02.tsx b/src/TsteeleComponent02.tsx
index 9881ceb..490dd4f 100644
--- a/src/TsteeleComponent02.tsx
+++ b/src/TsteeleComponent02.tsx
@@ -3,7 +3,9 @@ import Spinner from 'react-bootstrap/Spinner';
 
 const TsteeleComponent02 = () => {
   return (
-    <Card>
+    <Card
+        className="my-3"
+    >
         <Card.Body>
             <Card.Title
                 className='mb-3'