Merge branch 'master' of github.com:built/osbridge10

built · Jun 1, 2010 · 882cf37 · 882cf37
2 parents f299146 + ad6e03d
commit 882cf37
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/presentation/index.html b/presentation/index.html
@@ -106,15 +106,8 @@ <H1>The resulting image</H1>
  BEGIN INTERLUDE 1
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -->
-<DIV class="slide hammer">
-<H1>Interlude 1</H1>
-<div class="hbox">
-In which our fearless audience learns about constraints.
-<ul>
-    <li>eieio</li>
-    <li>Threats of watermelon?</li>
-</ul>
-</div>
+<DIV class="slide hammer" style="background-color: black">
+<img src="./lib/img/cc/54408373_af2dfafa99_b_memestate.jpg" width="600">
 </DIV>
 <!--
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/presentation/lib/img/copyrighted/3953914015_fb11e85da2_b.jpg b/presentation/lib/img/copyrighted/3953914015_fb11e85da2_b.jpg