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

This reverts commit ec688fd, reversing
changes made to 8896f16.

Author: eddiejaoude

_Open_source_accelerator/overview.md

@@ -0,0 +1,42 @@
+---
+title: Hack Brexit open source accelerator overview
+---
+# Introduction - Overview
+
+###  What is the accelerator all about?
+
+* A three month programme that takes 2 of the 10 projects created during Hack Brexit weekend
+
+* Run monthly meetings for the teams to present and discuss their projects progress, hosted by ThoughtWorks London
+
+* Help source additional volunteers to work with the teams on the projects
+
+* The organising committee will be on hand to provide planning and process assistance over the whole 3 months, and tap into expertise from ThoughtWorks and Code First: Girls community
+
+* The organising committee will manage external communications for the open source accelerator to help spread the word
+
+* At the end of 3 months we will run a final external presentation event with external attendees, we will analyse the progress and development of the project along with its future potential for continuing to grow
+
+* Connect the team members to the wider Hack Brexit meetup community
+
+### Why are we doing this?
+
+We want to continue from the success of the Hack Brexit hackathon on the 23-4 July to bring together technical and non-technical people to create tech solutions to drive dialog, unity and positive action beyond Brexit. We want to sustainably support and scale up projects that have a clear positive impact on society and respond to one of the three key themes we chose for the weekend: 1. Truth, fiction, & accountability; 2. Tolerance & prejudice; 3. Effective organising & campaigning.
+
+### T&Cs for accelerator
+
+* An open source project publicly available & accessible to all
+* Projects are created in a repository under the Hack Brexit public repository with an MIT License
+* Projects have an IP that is open to all & can be used by anyone
+* Projects speak to one of the three key themes identified at the Hack (Truth, Fiction & Accountability; Tolerance & prejudice; Effective organising & campaigning) or a future theme as agreed by the community
+* Commitment to work with a group of volunteers on the project for a duration of 3 months
+* Work alongside your project team volunteers & the Hack Brexit organisers to plan the outcomes for at least 3 months
+* Be a project that has scope to continue to be worked on by others in the future
+
+
+We'll be updating this page with further information as the projects develop, so do watch this space!
+
+### Sign up to join our mailing list here!
+<script src="//app-e.marketo.com/js/forms2/js/forms2.min.js"></script>
+<form id="mktoForm_4929"></form>
+<script>MktoForms2.loadForm("//app-e.marketo.com", "199-QDE-291", 4929);</script>

_includes/header.html

@@ -11,11 +11,7 @@
       <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>

_layouts/open_source_accelerator.html

@@ -1,33 +1,21 @@
 {% 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>