1 files changed, 33 insertions, 0 deletions
diff --git a/templates/index.liquid b/templates/index.liquid
index 2bc3a92..e554ac9 100644
--- a/templates/index.liquid
+++ b/templates/index.liquid
@@ -7,14 +7,28 @@
 </head>
 <body>
 
+<<<<<<< HEAD
+
+=======
+>>>>>>> eddee7c150388106979c16221b3ee106e53b1990
 <div id='header'>
+  <center>
   <h1>How to make a Folkestone.</h1>
   <a href="https://docs.google.com/forms/d/10dqrK_3UZW_xlPWQLERd0xTwVONryyicNuz2aYz3X_I/edit?c=0&w=1"><h2>Participate!</h2></a>
   <div id='tags'></div>
+<<<<<<< HEAD
+  </center>
 </div>
 <br>
 
+
+=======
+</div>
+<br>
+
+>>>>>>> eddee7c150388106979c16221b3ee106e53b1990
 <div id='body'>
+  <center>
   {% for entry in entries %}
     {% unless entry.disabled %}
       <div class='cell' data-id='{{ entry.id }}'>
@@ -24,7 +38,26 @@
       </div>
     {% endunless %}
   {% endfor %}
+<<<<<<< HEAD
+  </center>
+</div>
+
+<center>
+<div id='footer'>
+
+    <div class='cell' data-id='{{ testimonial.id }}'>
+    </div>
+    <div class='cell' data-id='{{ developer.id }}'>
+    </div>
+    <a href="http://howtomakeafolkestone.life/acknowledgements">
+      Acknowledgements</a>
+
+</div>
+</center>
+
+=======
 </div>
+>>>>>>> eddee7c150388106979c16221b3ee106e53b1990
 
 {% for page in pages %}
   {% unless page.disabled %}