merged branch conflicts as the master branch was behind on the open_source_accelerator_27 branch and gave conlict messages

Author: charlottebrf

_Open_source_accelerator/overview.md

@@ -11,7 +11,11 @@
       <a class="nav-link" href="sign_up_form.html">Sign up form</a>
     </li>
     <li class="nav-item">
+<<<<<<< HEAD
+      <a class="nav-link" href="open_source_accelerator.html">Open Source Accelerator</a>
+=======
       <a class="nav-link" href="open_source_accelerator.html">Open source accelerator</a>
+>>>>>>> master
     </li>
   </ul>
 </nav>

_includes/header.html

@@ -1,21 +1,33 @@
 {% include head.html %}
 
 <div class="container">
+<<<<<<< HEAD
+  {% include header.html %}
+=======
     {% include header.html %}
+>>>>>>> master
 
   <h1>Hack Brexit Open Source Accelerator</h1>
 
   <ul>
     <li><p><b>Join the Hack Brexit fortnightly Wednesday meetup group <a href="https://www.meetup.com/Hack-Brexit/" target="_blank"> here</a></p></b></li>
 
+<<<<<<< HEAD
+    <li><p><b>Join the Hack Brexit slack group for discussion outside of these in person meetups <a href="https://hackbrexit.herokuapp.com/" target="_blank"> here</a></p></b></li>
+=======
     <li><p><b>Join the Hack Brexit slack group <a href="https://hackbrexit.herokuapp.com/" target="_blank"> here</a></p></b></li>
+>>>>>>> master
   </ul>
 
   <h2>What is the accelerator all about?</h2>
 
   <ul>
 
+<<<<<<< HEAD
+    <li>The accelerator is a three month programme that takes 2 of the 10 projects created during Hack Brexit weekend.</li>
+=======
     <li>A three month programme that takes 2 of the 10 projects created during Hack Brexit weekend.</li>
+>>>>>>> master
 
     <li>Run regular monthly meetings for the teams to present and discuss their projects progress, hosted by ThoughtWorks London.</li>