Merge pull request #3 from chloeimb/newText

Second requested pull request

Author: chloeimb

src/App.js

@@ -5,9 +5,16 @@ function App() {
   return (
     <div className="App">
       <header className="App-header">
+<<<<<<< HEAD
         <img src={gatorLogo} className="App-logo" alt="logo" />
         <p> Hello World! </p>
         <p> My name is Chloe Imbusch and this is my project </p>
+=======
+        <img src={logo} className="App-logo" alt="logo" />
+        <p>
+          Hello World! This is our team project.
+        </p>	
+>>>>>>> 242861e (added new project text)
       </header>
     </div>
   );