Revert "Pulled"

This reverts commit 48f6fbaa

home/home.html

@@ -84,6 +84,11 @@
         </div>
     </div>
     
+<<<<<<< HEAD
+    <div class="conclusion">
+        <p>The website was created by first year students</p>
+    </div>
+=======
     <footer>
         <div class="container">
             <div class="row">
@@ -113,6 +118,7 @@
             crossorigin="anonymous"></script>
 
     
+>>>>>>> 169820e71c567bd29d87b398a1f93f3042759566
     
 </body>
 </html>
\ No newline at end of file