From 8a842e66126290cedce46a1e02cb346297e4ca93 Mon Sep 17 00:00:00 2001
From: samilieberman <samilieberman1@gmail.com>
Date: Mon, 7 Nov 2022 20:54:51 -0500
Subject: [PATCH] Added new project text to App.js and merged with changes from
 helloWorld branch.

refactor: Resolved merge conflicts in App.js from helloWorld branch updates.

style: Added new project text.
---
 src/App.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/App.js b/src/App.js
index 76d383cbe..38657dad2 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,12 +1,14 @@
-import gatorLogo from './gator.gif';
+import logo from './gator.gif';
 import './App.css';
 
 function App() {
   return (
     <div className="App">
       <header className="App-header">
-        <img src={gatorLogo} className="App-logo" alt="logo" />
-        <p> Hello World! </p>
+        <img src={logo} className="App-logo" alt="logo" />
+        <p>
+          Hello World! This is our team project.
+        </p>	
         <p> My name is Ryan B and this is my project </p>
       </header>
     </div>