Merge branch 'master' of github.com:twilio/workshop

twilio · Oct 16, 2012 · 2821bf2 · 2821bf2
2 parents 5952c40 + 23a301b
commit 2821bf2
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,7 @@
-# Twilio Workshop
+# TwilioCon Workshop
 
-Check out the [html version](http://twilio-workshop-cal.readthedocs.org/en/latest) of the guide here.
+Hello and welcome to TwilioCon Workshop Day
+
+You'll want to open the [workshop
+guide](http://twiliocon-workshop.readthedocs.org/en/latest/), which contains
+all the information for the rest of the day.