Permalink
Browse files

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

  • Loading branch information...
2 parents 5952c40 + 23a301b commit 2821bf2cb017d0b86cbeb4694f0079c42922dc3e @kelvl kelvl committed Oct 16, 2012
Showing with 6 additions and 2 deletions.
  1. +6 −2 README.md
View
@@ -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.

0 comments on commit 2821bf2

Please sign in to comment.