Resolving conflict

2016-09/NetflixMethodology.html

@@ -79,14 +79,14 @@
             </ul>
 
             <h3>Pre-Test</h3>
-            <p>While plugged in, each respective browser was navigated to Netflix.com and logged into the same account. The show “Nature: Animal Misfits” was queued and paused immediately on each browser. Each computer was verified to have brightness set to 75% (with ambient brightness disabled) and volume to 25%.</p>
+            <p>While plugged in, each respective browser was navigated to Netflix.com and logged into the same account. The show “Nature: Animal Misfits” was queued and paused immediately on each browser. Each computer was verified to have brightness set to 75% (with ambient brightness disabled) and volume to 25%.</p>
 
             <h3>Test</h3>
             <ol>
                 <li>Start recording with camera</li>
                 <li>Unplug the power bar that all four devices are charging from, ensuring they switch to battery at the same time</li>
                 <li>Immediately push play on all devices and start timing</li>
-                <li>When there’s less than 5 min remaining in the show, manually use the seek control to reset all devices to the beginning</li>
+                <li>When there’s less than 5 min remaining in the show, manually use the seek control to reset all devices to the beginning</li>
                 <li>Repeat until all devices have run out of battery, recording the time for each of them</li>
             </ol>
 
@@ -123,4 +123,4 @@
             <img src="NetflixResults2.png" width="599" height="283"/>
         </div>
     </body>
-</html>
+</html>

README.md

@@ -7,7 +7,7 @@ _Program Manager, Microsoft Edge_
 
 We measured the time it took four identical Surface Book laptops to run fully through their batteries while streaming video. The results were recorded with a camera and a time lapse was made available publicly:
 
-[![Battery tests on streaming video comparing Google Chrome, Mozilla Firefox, and Opera.](https://github.com/MicrosoftEdge/videotest/blob/gh-pages/videotest-poster.jpg?raw=true)](https://www.youtube.com/watch?v=rjrxOOfi54k)
+[![Battery tests on streaming video comparing Google Chrome, Mozilla Firefox, and Opera.](https://microsoftedge.github.io/videotest/videotest-poster.jpg)](https://www.youtube.com/watch?v=rjrxOOfi54k)
 
 The results showed that Microsoft Edge (7:22:07) lasted: 
 * 70% longer than Google Chrome (4:19:50) 

index.html

@@ -39,7 +39,7 @@
 
 <p>We measured the time it took four identical Surface Book laptops to run fully through their batteries while streaming video. The results were recorded with a camera and a time lapse was made available publicly:</p>
 
-<p><a href="https://www.youtube.com/watch?v=rjrxOOfi54k"><img src="https://github.com/MicrosoftEdge/videotest/blob/gh-pages/videotest-poster.jpg?raw=true" alt="Battery tests on streaming video comparing Google Chrome, Mozilla Firefox, and Opera."></a></p>
+<p><a href="https://www.youtube.com/watch?v=rjrxOOfi54k"><img src="https://microsoftedge.github.io/videotest/videotest-poster.jpg" alt="Battery tests on streaming video comparing Google Chrome, Mozilla Firefox, and Opera."></a></p>
 
 <p>The results showed that Microsoft Edge (7:22:07) lasted: </p>