Merge branch 'gh-pages' of https://github.com/pioneers/finalcomp-2016 into gh-pages

Author: Vasti-98

index.html

@@ -174,7 +174,7 @@ <h2>Connect with us</h2><span class="social-media"><a href="https://twitter.com/
 
                 <div>
                   <paper-material  elevation="1">
-                    <iframe width="100%" height="600px"src="https://docs.google.com/spreadsheets/d/e/2PACX-1vTYGiiplKYPIQpGZ7fRHX9oUQCarTgkSSaE1naEt6EwORDZidZeAYp5atSrqw80Evz7ZH4RjMKHXgio/pubhtml?gid=1772395932&single=true"></iframe>
+                    <iframe width="100%" height="600px" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vTYGiiplKYPIQpGZ7fRHX9oUQCarTgkSSaE1naEt6EwORDZidZeAYp5atSrqw80Evz7ZH4RjMKHXgio/pubhtml?gid=1772395932&single=true"></iframe>
                    </paper-material>
 
 
@@ -203,8 +203,13 @@ <h2>Connect with us</h2><span class="social-media"><a href="https://twitter.com/
             <section data-route="livestream" tabindex="-1">
               <paper-material elevation="1">
                 <h2>Livestream</h2>
-                <div class="video-wrap"><a class="embedly-card" href="https://www.twitch.tv/pierobotics/">PiERobotics</a>
-                  <script async="" src="//cdn.embedly.com/widgets/platform.js" charset="UTF-8"></script>
+                <div class="video-wrap"><a class="embedly-card" href="https://www.twitch.tv/pierobotics">PiERobotics</a>
+                  <iframe
+                      src="https://www.twitch.tv/pierobotics"
+                      height="<height>"
+                      width="<width>"
+                      allowfullscreen>
+                  </iframe>
                 </div>
               </paper-material>
             </section>