From: Dylan Lloyd <dylan@psu.edu>
Date: Sat, 8 Jan 2011 03:01:39 +0000 (-0500)
Subject: Merge branch 'dev' into live
X-Git-Url: https://disinclined.org/git/?a=commitdiff_plain;h=8b9dbe440144bf6c7495420754affe0e6e54b9df;hp=21de49c4d94a44ca42db38ac263740753c8ab8bb;p=dylansserver.git

Merge branch 'dev' into live
---

diff --git a/index.php b/index.php
index 1554f33..c9df42c 100644
--- a/index.php
+++ b/index.php
@@ -61,6 +61,26 @@
           "http://www.python.org/">python</a>.</span>
         </div>
 
+        <div class="tabs" id="i_like_pandora_">
+          <span class="youtube_backup-entry"><a href=
+          "https://github.com/nospampleasemam/i_like_pandora">i_like_pandora</a></span>
+          <br>
+          <br>
+          <span class="youtube_backup-entry"><br>
+		  searches <a href="http://youtube.com">youtube</a> for what you like on <a href="http://pandora.com">pandora</a>.
+          <br>
+          <br>
+		  then it downloads the first video.
+          <br>
+          <br>
+		  it's not <i>quite</i> done yet.
+          <br>
+          <br>
+          <br>
+		  the code is free (as in freedom), <a href="http://github.com/nospampleasemam/i_like_pandora">here</a>.
+          <br>
+        </div>
+
         <div class="tabs" id="peepshow_">
           <h3><i><a href=
           "foxy-addons/peepshow/peepshow.xpi">foxy-addons/</a></i></h3>
@@ -130,6 +150,11 @@
 
         <li style="list-style: none"><br></li>
 
+        <li class="project"><a class="exhibit" href=
+        "#i_like_pandora">i_like_pandora</a></li>
+
+        <li style="list-style: none"><br></li>
+
         <li class="project"><a class="exhibit" href=
         "#peepshow">foxy-addons/peepshow</a></li>