From: Dylan Lloyd <dylan@psu.edu>
Date: Tue, 18 Jan 2011 23:51:01 +0000 (-0500)
Subject: Merge branch 'dev' into live
X-Git-Url: https://disinclined.org/git/?a=commitdiff_plain;h=de846efb728bbf7b0aeae8a50219a55a321ed440;hp=2199cd5ea71995f93a38c157f3e18da8e895fd87;p=dylansserver.git

Merge branch 'dev' into live
---

diff --git a/index.php b/index.php
index bccbb1d..a965a2a 100644
--- a/index.php
+++ b/index.php
@@ -64,7 +64,7 @@
           <br>
           then it downloads the first video.<br>
           <br>
-          it's not quite done yet.<br>
+          it's working, but i'm still making it better.<br>
           <br>
           <br>
           the code is free (as in freedom), <a href=