Merge remote-tracking branch 'origin/patch-1' into random-improvements

# Conflicts:
#	war/index.html

Author: sedflix

war/index.html

@@ -370,7 +370,7 @@ <h2>
             at
         </h2>
         <br>
-
+        <div id="tedx"></div>
         <!--<div id="tedx" onclick=Javascript:window.open("https://www.youtube.com/watch?v=RY2-0-QsuTE")></div>-->
         <!--<div class="row-fluid">-->
         <!--<div class="span12">-->
@@ -379,10 +379,10 @@ <h2>
         <!--</div>-->
         <div class="row-fluid">
             <div class="span6" title="A worm is our best bet to unlock the secrets of the brain by Stephen"
-                 onclick=Javascript:window.open("https://www.youtube.com/watch?v=RY2-0-QsuTE")>
+                 onclick=Javascript:window.open("https://www.youtube.com/watch?v=RY2-0-QsuTE") style="cursor: pointer;">
                 <!--<h2 class="centered"><span class="ted">TED<sup>X</sup></span>Bangalore</h2>-->
                 <h2 class="centered" style="letter-spacing: 0;">
-                    <div id="tedx"></div>
+
                     Bangalore
                 </h2>
                 <!--<div class="videoWrapper">-->
@@ -395,10 +395,9 @@ <h2 class="centered" style="letter-spacing: 0;">
                 <!--Larson</p>-->
             </div>
             <div class="span6" title="Digital biology and open science &#45; the coming revolution by Stephen"
-                 onclick=Javascript:window.open("https://www.youtube.com/watch?v=EKopW86CCJo")>
+                 onclick=Javascript:window.open("https://www.youtube.com/watch?v=EKopW86CCJo") style="cursor: pointer;">
                 <!--<h2 class="centered"><span class="ted">TED<sup>X</sup></span>Vienna</h2> <br>-->
                 <h2 class="centered" style="letter-spacing: 0;">
-                    <div id="tedx"></div>
                     Vienna
                 </h2>
                 <!--<div class="videoWrapper">-->