add sinatra talk

rkh · Feb 15, 2012 · 662af2a · 662af2a
1 parent 11a5182
commit 662af2a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -14,9 +14,6 @@ Gave talk at:
 * Rocky Mountain Ruby 2011
 * RubyConf Brazil 2011
 * RubyConf Uruguay 2011
-
-Will be giving talk at:
-
 * Rails Club Moscow 2011
 
 ### Message In A Bottle
@@ -45,3 +42,11 @@ Gave talk at:
 Gave talk at:
 
 * RubyConf Argentina 2011
+
+### Sinatra: Past, Present, Future
+
+[proposal](https://github.com/rkh/proposals/blob/master/prepared_talks/sinatra.md)
+
+Gave talke at:
+
+* toster.ru {ruby} 2011
diff --git a/prepared_talks/sinatra.md b/prepared_talks/sinatra.md
@@ -0,0 +1,3 @@
+# Sinatra: Past, Present, Future
+
+A look at Sinatra's history, current state and what the future might bring.