fixed merge conflicts

diff --cc lectures.php
index cd9e09bc1c57a3f3c61e1fbdfcafbd62a3d66f05,20e0b40b0d0c81b26e932bbe1ccd78bd3797ed7d..86fbd6153fcfed3954672c0ce1d4c609a9288474
--- 1/lectures.php
--- 2/lectures.php
+++ b/lectures.php
@@@ -123,17 -133,22 +133,21 @@@ platforms that they run on.</p
  
  <h2>Lecture 12: FOSS Culture</h2>
  
- This lecture delves into the world of FOSS culture.<p>
+ <p>This lecture delves into the world of FOSS culture.</p>
  
- <ul><li><a
- href="lectures/foss_culture.pdf">foss_culture.pdf</a></ul>
+ <ul>
+ <li><a href="lectures/foss_culture.pdf">foss_culture.pdf</a></li>
+ <li><a href="videos/MOV011.low.ogv">LQ video</a> (100M Ogg/Theora)</li>
+ </ul>
  
 -
  <h2>Lecture 13: Starting a new project</h2>
  
- This lecture looks at what is involved in staring a new FOSS project.<p>
+ <p>This lecture looks at what is involved in staring a new FOSS project.</p>
  
- <ul><li><a
- href="lectures/starting_a_project.pdf">starting_a_project.pdf</a></ul>
+ <ul>
+ <li><a href="lectures/starting_a_project.pdf">starting_a_project.pdf</a></li>
+ <li><a href="videos/MOV012.low.ogv">LQ video</a> (89M Ogg/Theora)</li>
+ </ul>
  
  <h2>Lecture 14: FOSS Tales</h2>
  
@@@ -145,11 -162,12 +161,12 @@@ shaped the FOSS world.</p
  
  <h2>Lecture 15: Release early, Release often</h2>
  
- This lecture sums up the weeks material.<p>
- 
- <ul><li><a
- href="lectures/release_early_tales.pdf">release_early.pdf</a></ul>
+ <p>This lecture sums up the weeks material.</p>
  
 -<li><a href="lectures/release_early_tales.pdf">release_early.pdf</a></li>
+ <ul>
++<li><a href="lectures/release_early.pdf">release_early.pdf</a></li>
+ <li><a href="videos/MOV01B.low.ogv">LQ video</a> (37M Ogg/Theora)</li>
+ </ul>
  
  <hr>