コンフリクトを解決

Merge branch 'master' of https://github.com/coderdojo-japan/dojocon2018.coderdojo.jp into contest-link

Author: kiriem

index.html

@@ -119,7 +119,7 @@ <h2 class="heading__01">SESSION</h2>
               <div class="post-list__thumbnail"><a href="{{ site.url }}{{ session.url }}"><img src="img/{{ session.thumbnail }}" alt="{{session.speaker-name}}の顔写真"></a></div>
               <div class="post-list__content">
                 <h3 class="post-list__title">{{ session.j-title }}</h3>
-                <!--p.post-list__time-->
+                <p class="post-list__time">{{session.time-schedule}}</p>
                 <p class="post-list__speaker">{{ session.speaker-name }}</p>
               </div>
               <div class="post-list__more"><a class="btn btn__white btn__xl" href="{{ site.url }}{{ session.url }}" role="button">more</a></div></article>
@@ -173,8 +173,7 @@ <h3 class="text-center">Silver</h3>
 
   </div>
 
-  <h3 class="text-center">Bronse</h3>
-  
+  <h3 class="text-center">Bronze</h3>
   <div class="row">
 
     <div class="col-6 col-md-4 col-lg-3">