Merge branch 'gh-pages' into develop

# Conflicts:
#	css/main.css
#	index.html

index.html

@@ -19,7 +19,7 @@
       <link rel="mask-icon" href="img/new-site/logo-mask.svg" color="4360DF">
 
       <!-- favicon.ico in the root directory -->
-      <link rel="stylesheet" href="css/main.css?v=18f5be2">
+      <link rel="stylesheet" href="css/main.css?v=13cb666">
 
       <meta property="og:title" content="Status, a Mobile Ethereum OS" />
 
@@ -148,7 +148,18 @@
                     <div class="phone-layer"></div>
                   </div>
 
-                  <div class="phone-device"></div>
+                  <div class="phone-device">
+                    <div class="phone-lines">
+                      <div class="phone-line"></div>
+                      <div class="phone-line"></div>
+                      <div class="phone-line"></div>
+                    </div>
+                    <div class="phone-dots">
+                      <div class="phone-dot"></div>
+                      <div class="phone-dot"></div>
+                      <div class="phone-dot"></div>
+                    </div>
+                  </div>
 
                   <div class="phone-docs-button">
                     <p>Check out our resources and familiarize yourself with our documentation.</p>
@@ -193,7 +204,11 @@
                     <div class="step-number">1</div>
                     <div class="step-description">
                       <h3 class="step-title"><span class="step-title-number">1. </span>Join the Community</h3>
+<<<<<<< HEAD
                       <div class="step-text">Come say Hi in #hackathon. We’re friendly people! You can meet teammates and get your questions answered. We'll also pin updates along the way here.</div>
+=======
+                      <div class="step-text">Come say Hi in #hackathon (we’re friendly people!). You can meet teammates and get your questions answered.</div>
+>>>>>>> gh-pages
                     </div>
                     <a class="button button--secondary step-button" target="_blank" href="http://slack.status.im/">Join our Slack</a>
                   </div>
@@ -201,7 +216,11 @@
                     <div class="step-number">2</div>
                     <div class="step-description">
                       <h3 class="step-title"><span class="step-title-number">2. </span>Submit Entry via Github</h3>
+<<<<<<< HEAD
                       <div class="step-text">We're using GitHub for submissions. Before the Kickoff, add your team's project as an <em>issue</em>. Then, edit it as you make progress. By the <strong>Pencils Down</strong> deadline, your issue should include everything on the template and you should make a <em>pull request</em> with your code.</div>
+=======
+                      <div class="step-text">Before the Kickoff, add your team's project as an issue on GitHub. Then, edit it along the way as you make progress. By the deadline, your project should include your open-source code. <br/><br/>You also may add an up to two-minute video showing how your DApp, chatbot, or command works. You can also show slides or pictures in the video as further explanation, but these are no substitute for working code. Judges will make decisions based on technical achievement, not marketing ability.</div>
+>>>>>>> gh-pages
                     </div>
                     <a class="button button--secondary step-button" target="_blank" href="https://github.com/status-im/hackathon/issues/new">Submit Issue</a>
                   </div>
@@ -369,7 +388,7 @@
       </div>
 
 
-    <script src="js/app.js?v=2033b57"></script>
+    <script src="js/app.js?v=121ebe5"></script>
     <!-- Google Analytics -->
     <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){