adds changes to open source accelerator page and header and sign up form to avoid conflict

Author: charlottebrf

_includes/header.html

@@ -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>

_layouts/open_source_accelerator.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>
 

_layouts/sign_up_form.html

@@ -5,12 +5,20 @@
 
 <h1>Hack Brexit Mailing List</h1>
 
-<p>Sign up on our Hack Brexit contact form for us to keep you updated with all of the latest news </p>
+<p>Fill in your details here for us to keep you updated with the latest news about the Hack Brexit project.</p>
 
-<form method="POST" action="http://formspree.io/hackbrexit@gmail.com">
-  <input type="email" name="email" placeholder="Your email">
-  <input type="name" name="name" placeholder="Your name">
-  <button type="submit">Send</button>
+<form method="post" action="http://formspree.io/hackbrexit@gmail.com">
+  <div class="form-group">
+    <label for="fullname">Full Name</label>
+    <input type="name" name="name" class="form-control" id="fullname" placeholder="Your fullname">
+  </div>
+
+   <div class="form-group">
+     <label for="email">Email</label>
+     <input type="email" email="email" class="form-control" id="email" placeholder="Your email">
+   </div>
+
+ <button type="submit" class="btn btn-primary btn-block">Sign up for updates on Hack Brexit</button>
 </form>
 
 </div>