Updates status of the projects & resolves conflicts

Author: charlottebrf

_layouts/default.html

@@ -7,12 +7,16 @@
     <div class="card">
         <h3 class="card-header">
             {{ post.name }}
-            {% if post.status == 'active' %}
-                <span class="label label-success">Active</span>
+            {% if post.status == 'Accelerated' %}
+                <span class="label label-success">Accelerated</span>
             {% endif %}
-            {% if post.status == 'inactive' %}
-                <span class="label label-danger">Inactive</span>
+            {% if post.status == 'In progress' %}
+                <span class="label label-info">In progress</span>
             {% endif %}
+            {% if post.status == 'On hold' %}
+                <span class="label label-danger">On hold</span>
+            {% endif %}
+
         </h3>
         <!--<img class="card-img-top" data-src="..." alt="Card image cap">-->
         <div class="card-block">

_posts/2016-07-24-BrexLex.md

@@ -6,5 +6,5 @@ display_date: July 2016
 github_url: https://github.com/HackBrexit/BrexLex
 presentation_url: https://drive.google.com/open?id=1l0OWeE34QIPVd_gkPAuZq5afCRTeNqbgG5dL0zXVVqs
 introduction_url: WEoXSfAtr8Q
-status: in progress
+status: In progress
 ---

_posts/2016-07-24-BrexitNet.md

@@ -6,5 +6,5 @@ display_date: July 2016
 github_url: https://github.com/HackBrexit/BrexitNet
 presentation_url:
 introduction_url:
-status: on hold
+status: On hold
 ---

_posts/2016-07-24-CampaignNinja.md

@@ -6,5 +6,5 @@ display_date: July 2016
 github_url: https://github.com/HackBrexit/CampaigningNinja
 presentation-url: https://drive.google.com/open?id=1j0XdlOtpvRWAekr3PDATntDzMaonIs39VzxitAPlqmE
 introduction_url: GNRqcbHTT4M
-status: on hold
+status: On hold
 ---

_posts/2016-07-24-ExitGap.md

@@ -6,5 +6,5 @@ display_date: July 2016
 github_url: https://github.com/HackBrexit/ExitGap
 presentation_url: https://drive.google.com/open?id=1VJ_aCrW8TsWwUUPsDmPis3B-2wVmUuIk86nTSfZqzlE
 introduction_url: maUBGM0Pol4
-status: on hold
+status: On hold
 ---

_posts/2016-07-24-Fixit.md

@@ -6,5 +6,5 @@ display_date: July 2016
 github_url:
 presentation_url: https://drive.google.com/open?id=1_DeN7X8uzBsyK9ePBe2je8ljvt_cTvPv9UtU36YpSts
 introduction_url: opnlCMKfyLI
-status: on hold
+status: On hold
 ---

_posts/2016-07-24-HackBrexit.md

@@ -4,5 +4,5 @@ name: HackBrexit
 description: Hackathon project list
 display_date: July 2016
 github_url: https://github.com/HackBrexit/hackbrexit.github.io
-status: active
+status: Accelerated
 ---

_posts/2016-07-24-IStreetwatch.md

@@ -6,5 +6,5 @@ display_date: July 2016
 github_url: https://github.com/HackBrexit/IStreetWatch
 presentation_url: https://drive.google.com/open?id=1wiyu31ulcOoFEdgGSJO0kEGibAq-fzQQX3JQYkkg7Yk
 introduction_url: JyzcKjWB8U4
-status: in progress
+status: In progress
 ---

_posts/2016-07-24-MinistersUndertheInfluence.md

@@ -6,5 +6,5 @@ display_date: July 2016
 github_url: https://github.com/HackBrexit/MinistersUnderTheInfluence
 presentation_url: https://drive.google.com/open?id=1-CsMiIhywwpsGFKeEBzOfc9a6BTBb8nk284ctJra77o
 introduction_url: bVbTzTd2ZRs
-status: accelerated
+status: Accelerated
 ---

_posts/2016-07-24-PopOutsideTheEchoChamber.md

@@ -6,5 +6,5 @@ display_date: July 2016
 github_url: https://github.com/HackBrexit/hackbrexit.github.io
 presentation_url: https://drive.google.com/open?id=1N3PFbBpczqFTsFtcHs3eRdbfW9UhnfVK_Lde5KQxJNw
 introduction_url: ngXoltv5TEo
-status: on hold
+status: On hold 
 ---