Merge branch 'master' into Projects

Author: elroyK

2018.html

@@ -73,7 +73,7 @@
                     <!--<li><a href="2018.html" class="button link lowercase u-margin--right">2018</a></li>-->
                     <li>
                       <!-- <a href="2018.summerofcode.be" target="_blank" class="button">View 2018 showcase</a> -->
-                      <a href="2018.html" target="_blank" class="button">Discover all osoc18 projects<span class="button__info"></span></a>
+                      <a href="2018.html" target="_blank" class="button">Discover all oSoc18 projects<span class="button__info"></span></a>
                     </li>
                 </ul>
             </div>
@@ -1499,4 +1499,4 @@ <h2 class="h4">Xavier
     <script src="js/app.js"></script>
 </body>
 
-</html>
+</html>

coaches.html

@@ -73,7 +73,7 @@
                     <!--<li><a href="2018.html" class="button link lowercase u-margin--right">2018</a></li>-->
                     <li>
                         <!-- <a href="2018.summerofcode.be" target="_blank" class="button">View 2018 showcase</a> -->
-                        <a href="2018.html" target="_blank" class="button">Discover all osoc18 projects<span class="button__info"></span></a>
+                        <a href="2018.html" target="_blank" class="button">Discover all oSoc18 projects<span class="button__info"></span></a>
                     </li>
                 </ul>
             </div>
@@ -307,4 +307,4 @@ <h2 class="h5"><a href="https://github.com/oSoc18/gentlestudent" target="_blank"
     <script src="js/app.js"></script>
 </body>
 
-</html>
+</html>

companies.html

@@ -72,7 +72,7 @@
                                 <!--<li><a href="2018.html" class="button link lowercase u-margin--right">2018</a></li>-->
                     <li>
                       <!-- <a href="2018.summerofcode.be" target="_blank" class="button">View 2018 showcase</a> -->
-                      <a href="2018.html" target="_blank" class="button">Discover all osoc18 projects<span class="button__info"></span></a>
+                      <a href="2018.html" target="_blank" class="button">Discover all oSoc18 projects<span class="button__info"></span></a>
                     </li>
           </ul>
         </div>
@@ -475,4 +475,4 @@ <h2 class="h5"><a href="https://github.com/oSoc18/gentlestudent" target="_blank"
     <script src="https://cdnjs.cloudflare.com/ajax/libs/foundation/6.4.3/js/foundation.js"></script>
     <script src="js/app.js"></script>
   </body>
-</html>
+</html>

index.html

@@ -72,7 +72,7 @@
                     <!--<li><a href="2018.html" class="button link lowercase u-margin--right">2018</a></li>-->
                     <li>
                       <!-- <a href="2018.summerofcode.be" target="_blank" class="button">View 2018 showcase</a> -->
-                      <a href="2018.html" target="_blank" class="button">Discover all osoc18 projects<span class="button__info"></span></a>
+                      <a href="2018.html" target="_blank" class="button">Discover all oSoc18 projects<span class="button__info"></span></a>
                     </li>
           </ul>
         </div>
@@ -450,4 +450,4 @@ <h2 class="h3"><a href="coaches.html">coaches</a></h2>
 
     </script> -->
   </body>
-</html>
+</html>

practical.html

@@ -529,4 +529,4 @@ <h6>Couldn't find what you were looking for?</h6>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/foundation/6.4.3/js/foundation.js"></script>
     <script src="js/app.js"></script>
   </body>
-</html>
+</html>

students.html

@@ -277,4 +277,4 @@ <h1 class="hero-head">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/foundation/6.4.3/js/foundation.js"></script>
     <script src="js/app.js"></script>
   </body>
-</html>
+</html>