<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>img/aloha_on_rails.png</filename>
    </added>
    <added>
      <filename>img/ibm.png</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -4836,7 +4836,15 @@ jQuery.extend( jQuery.easing,
         
           &lt;div class=&quot; centereverything&quot;&gt;
             &lt;div id=&quot;slide-0&quot; class=&quot;content&quot;&gt;
-              &lt;p&gt;&lt;img src=&quot;img/railsbridge_logo.png&quot;&gt;&lt;/p&gt;&lt;h1&gt;Ruby on Rails Workshop&lt;/h1&gt;&lt;h3&gt;September 26th, 2009&lt;/h3&gt;&lt;h5&gt;wireless: &quot;sfCUBE - n1&quot; - no password&lt;/h5&gt;&lt;h5&gt;hashtag: #sfruby&lt;/h5&gt;
+              &lt;table&gt;&lt;tr&gt;
+&lt;td&gt;
+&lt;img src=&quot;img/railsbridge_logo.png&quot;&gt;
+&lt;/td&gt;
+&lt;td&gt;
+&lt;img src=&quot;img/aloha_on_rails.png&quot; height=&quot;250&quot;&gt;
+&lt;/td&gt;
+&lt;/tr&gt;&lt;/table&gt;
+&lt;h2&gt;Aloha on Rails&lt;/h2&gt;&lt;h1&gt;Ruby on Rails Workshop&lt;/h1&gt;&lt;h3&gt;October 3rd, 2009&lt;/h3&gt;&lt;h5&gt;wireless: rails3 - no pwd&lt;/h5&gt;&lt;h5&gt;hashtag: #alohaonrails&lt;/h5&gt;
             &lt;/div&gt;
           &lt;/div&gt;
         
@@ -4848,14 +4856,13 @@ jQuery.extend( jQuery.easing,
 &lt;ul&gt;
 &lt;li&gt;Many individuals&lt;/li&gt;
 &lt;li&gt;RailsBridge&lt;/li&gt;
-&lt;li&gt;SF Ruby Meetup&lt;/li&gt;
 &lt;li&gt;DevChix&lt;/li&gt;
 &lt;/ul&gt;
 &lt;/li&gt;
 &lt;li&gt;Open materials
 
 &lt;ul&gt;
-&lt;li&gt;Workshop planning: devchix wiki&lt;/li&gt;
+&lt;li&gt;Workshop planning: DevChix wiki&lt;/li&gt;
 &lt;li&gt;Slides: github, slidedown&lt;/li&gt;
 &lt;/ul&gt;
 &lt;/li&gt;
@@ -4865,49 +4872,30 @@ jQuery.extend( jQuery.easing,
         
           &lt;div class=&quot;&quot;&gt;
             &lt;div id=&quot;slide-2&quot; class=&quot;content&quot;&gt;
-              &lt;h1&gt;Space: sfCUBE&lt;/h1&gt;&lt;h1&gt;Everything else: Heroku&lt;/h1&gt;
+              &lt;p&gt;&lt;img src=&quot;img/ibm.png&quot;&gt;&lt;/p&gt;
             &lt;/div&gt;
           &lt;/div&gt;
         
           &lt;div class=&quot;&quot;&gt;
             &lt;div id=&quot;slide-3&quot; class=&quot;content&quot;&gt;
-              &lt;h1&gt;Projectors&lt;/h1&gt;&lt;ul&gt;
-&lt;li&gt;SlideShare&lt;/li&gt;
-&lt;li&gt;Pivotal Labs&lt;/li&gt;
-&lt;li&gt;ShareGrove&lt;/li&gt;
-&lt;li&gt;WorkingPoint&lt;/li&gt;
-&lt;li&gt;Sean Dick&lt;/li&gt;
-&lt;li&gt;Jennifer Abe&lt;/li&gt;
-&lt;/ul&gt;
+              &lt;h1&gt;Format&lt;/h1&gt;
             &lt;/div&gt;
           &lt;/div&gt;
         
           &lt;div class=&quot;&quot;&gt;
             &lt;div id=&quot;slide-4&quot; class=&quot;content&quot;&gt;
-              &lt;h1&gt;Why are we here?&lt;/h1&gt;
-            &lt;/div&gt;
-          &lt;/div&gt;
-        
-          &lt;div class=&quot;&quot;&gt;
-            &lt;div id=&quot;slide-5&quot; class=&quot;content&quot;&gt;
-              &lt;h1&gt;Why are you here?&lt;/h1&gt;
-            &lt;/div&gt;
-          &lt;/div&gt;
-        
-          &lt;div class=&quot;&quot;&gt;
-            &lt;div id=&quot;slide-6&quot; class=&quot;content&quot;&gt;
               &lt;h1&gt;What is Ruby on Rails?&lt;/h1&gt;
             &lt;/div&gt;
           &lt;/div&gt;
         
           &lt;div class=&quot; centereverything&quot;&gt;
-            &lt;div id=&quot;slide-7&quot; class=&quot;content&quot;&gt;
+            &lt;div id=&quot;slide-5&quot; class=&quot;content&quot;&gt;
               &lt;p&gt;&lt;img src=&quot;img/web-application.png&quot;&gt;&lt;/p&gt;
             &lt;/div&gt;
           &lt;/div&gt;
         
           &lt;div class=&quot;&quot;&gt;
-            &lt;div id=&quot;slide-8&quot; class=&quot;content&quot;&gt;
+            &lt;div id=&quot;slide-6&quot; class=&quot;content&quot;&gt;
               &lt;table width=&quot;100%&quot;&gt;
 &lt;tr&gt;
 &lt;td align=&quot;center&quot;&gt;
@@ -4927,7 +4915,7 @@ jQuery.extend( jQuery.easing,
           &lt;/div&gt;
         
           &lt;div class=&quot;&quot;&gt;
-            &lt;div id=&quot;slide-9&quot; class=&quot;content&quot;&gt;
+            &lt;div id=&quot;slide-7&quot; class=&quot;content&quot;&gt;
               &lt;table width=&quot;100%&quot;&gt;
 &lt;tr&gt;
 &lt;td align=&quot;center&quot;&gt;
@@ -4951,7 +4939,7 @@ jQuery.extend( jQuery.easing,
           &lt;/div&gt;
         
           &lt;div class=&quot;&quot;&gt;
-            &lt;div id=&quot;slide-10&quot; class=&quot;content&quot;&gt;
+            &lt;div id=&quot;slide-8&quot; class=&quot;content&quot;&gt;
               &lt;h2&gt;Ruby: programming language&lt;/h2&gt;&lt;ul&gt;
 &lt;li&gt;Object oriented&lt;/li&gt;
 &lt;li&gt;General purpose&lt;/li&gt;
@@ -4965,7 +4953,7 @@ jQuery.extend( jQuery.easing,
           &lt;/div&gt;
         
           &lt;div class=&quot;&quot;&gt;
-            &lt;div id=&quot;slide-11&quot; class=&quot;content&quot;&gt;
+            &lt;div id=&quot;slide-9&quot; class=&quot;content&quot;&gt;
               &lt;h1&gt;The Rails Philosophy&lt;/h1&gt;&lt;ul&gt;
 &lt;li&gt;Opinionated&lt;/li&gt;
 &lt;li&gt;Convention over configuration&lt;/li&gt;
@@ -4982,7 +4970,7 @@ jQuery.extend( jQuery.easing,
           &lt;/div&gt;
         
           &lt;div class=&quot;&quot;&gt;
-            &lt;div id=&quot;slide-12&quot; class=&quot;content&quot;&gt;
+            &lt;div id=&quot;slide-10&quot; class=&quot;content&quot;&gt;
               &lt;h1&gt;Agile development&lt;/h1&gt;&lt;p&gt;&lt;img src=&quot;http://img.skitch.com/20090801-jafkfs4eeawy19k9f3mjknb4ht.jpg&quot;&gt;&lt;/p&gt;&lt;ul&gt;
 &lt;li&gt;Pair programming&lt;/li&gt;
 &lt;li&gt;Test-driven or Behavior-driven development&lt;/li&gt;
@@ -4991,7 +4979,7 @@ jQuery.extend( jQuery.easing,
           &lt;/div&gt;
         
           &lt;div class=&quot;&quot;&gt;
-            &lt;div id=&quot;slide-13&quot; class=&quot;content&quot;&gt;
+            &lt;div id=&quot;slide-11&quot; class=&quot;content&quot;&gt;
               &lt;h1&gt;Goal&lt;/h1&gt;&lt;ul&gt;
 &lt;li&gt;By the end of the day, you will have built and deployed a web application live on the internet&lt;/li&gt;
 &lt;/ul&gt;
@@ -4999,7 +4987,7 @@ jQuery.extend( jQuery.easing,
           &lt;/div&gt;
         
           &lt;div class=&quot;&quot;&gt;
-            &lt;div id=&quot;slide-14&quot; class=&quot;content&quot;&gt;
+            &lt;div id=&quot;slide-12&quot; class=&quot;content&quot;&gt;
               &lt;h1&gt;Tools we'll be working with&lt;/h1&gt;&lt;ul&gt;
 &lt;li&gt;&lt;strong&gt;rails&lt;/strong&gt;&lt;/li&gt;
 &lt;li&gt;
@@ -5016,40 +5004,26 @@ jQuery.extend( jQuery.easing,
           &lt;/div&gt;
         
           &lt;div class=&quot;&quot;&gt;
-            &lt;div id=&quot;slide-15&quot; class=&quot;content&quot;&gt;
+            &lt;div id=&quot;slide-13&quot; class=&quot;content&quot;&gt;
               &lt;h1&gt;Today's project&lt;/h1&gt;&lt;p&gt;&lt;a href=&quot;http://www.ultrasaurus.com/rubyworkshop/app_design/&quot;&gt;&lt;img src=&quot;http://www.ultrasaurus.com/rubyworkshop/app_design/unauthenticated_home-0.jpg&quot; width=&quot;946&quot; height=&quot;420&quot;&gt;&lt;/a&gt;&lt;/p&gt;
             &lt;/div&gt;
           &lt;/div&gt;
         
           &lt;div class=&quot; &quot;&gt;
-            &lt;div id=&quot;slide-16&quot; class=&quot;content&quot;&gt;
-              &lt;h1&gt;announcements&lt;/h1&gt;
-            &lt;/div&gt;
-          &lt;/div&gt;
-        
-          &lt;div class=&quot; &quot;&gt;
-            &lt;div id=&quot;slide-17&quot; class=&quot;content&quot;&gt;
+            &lt;div id=&quot;slide-14&quot; class=&quot;content&quot;&gt;
               &lt;h1&gt;Schedule&lt;/h1&gt;&lt;ul&gt;
-&lt;li&gt;9:30 registration, breakfast&lt;/li&gt;
-&lt;li&gt;10:00-10:30 large group - intro&lt;/li&gt;
-&lt;li&gt;10:45-11:30 session 1&lt;/li&gt;
-&lt;li&gt;11:45-12:30 session 2&lt;/li&gt;
-&lt;li&gt;12:30-1:30 lunch&lt;/li&gt;
-&lt;li&gt;1:30-2:20 session 3&lt;/li&gt;
-&lt;li&gt;2:30-3:20 session 4&lt;/li&gt;
-&lt;li&gt;3:30-4:00 large group - wrap up&lt;/li&gt;
-&lt;li&gt;4:30 - clean up&lt;/li&gt;
-&lt;li&gt;5pm After party at the Dogpatch Saloon&lt;/li&gt;
+&lt;li&gt;9:00-9:30 sign in, breakfast&lt;/li&gt;
+&lt;li&gt;9:30-10:00 intro&lt;/li&gt;
+&lt;li&gt;10:00-10:50 session 1&lt;/li&gt;
+&lt;li&gt;11:00-11:50 session 2&lt;/li&gt;
+&lt;li&gt;12:00-1:00 lunch out&lt;/li&gt;
+&lt;li&gt;1:00-1:50 session 3&lt;/li&gt;
+&lt;li&gt;2:00-2:50 session 4&lt;/li&gt;
+&lt;li&gt;3:00-4:00 wrap up; final questions&lt;/li&gt;
 &lt;/ul&gt;
             &lt;/div&gt;
           &lt;/div&gt;
         
-          &lt;div class=&quot; &quot;&gt;
-            &lt;div id=&quot;slide-18&quot; class=&quot;content&quot;&gt;
-              &lt;h1&gt;Workshop Groups&lt;/h1&gt;
-            &lt;/div&gt;
-          &lt;/div&gt;
-        
       &lt;/div&gt;
     &lt;/div&gt;
   &lt;/body&gt;</diff>
      <filename>intro.html</filename>
    </modified>
    <modified>
      <diff>@@ -1,10 +1,15 @@
 !SLIDE centereverything
 
+&lt;table&gt;&lt;tr&gt;&lt;td&gt;
 &lt;img src=&quot;img/railsbridge_logo.png&quot;&gt;
+&lt;/td&gt;&lt;td&gt;
+&lt;img src=&quot;img/aloha_on_rails.png&quot; height=&quot;250&quot;&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
+## Aloha on Rails
 # Ruby on Rails Workshop
-### September 26th, 2009
-#####wireless: &quot;sfCUBE - n1&quot; - no password
-#####hashtag: #sfruby
+### October 3rd, 2009
+#####wireless: rails3 - no pwd
+#####hashtag: #alohaonrails
 
 !SLIDE
 
@@ -12,32 +17,16 @@
 * Community project
   * Many individuals 
   * RailsBridge
-  * SF Ruby Meetup
   * DevChix
 * Open materials
-  * Workshop planning: devchix wiki
+  * Workshop planning: DevChix wiki
   * Slides: github, slidedown
 
 !SLIDE
-# Space: sfCUBE
-# Everything else: Heroku
+&lt;img src=&quot;img/ibm.png&quot;&gt;
 
 !SLIDE
-# Projectors
-* SlideShare
-* Pivotal Labs
-* ShareGrove
-* WorkingPoint
-* Sean Dick
-* Jennifer Abe
-
-!SLIDE
-
-# Why are we here?
-
-!SLIDE
-
-# Why are you here?
+# Format
 
 !SLIDE
 
@@ -136,22 +125,12 @@
 &lt;a href=&quot;http://www.ultrasaurus.com/rubyworkshop/app_design/&quot;&gt;&lt;img src=&quot;http://www.ultrasaurus.com/rubyworkshop/app_design/unauthenticated_home-0.jpg&quot; width=&quot;946&quot; height=&quot;420&quot;/&gt;&lt;/a&gt;
 
 !SLIDE 
-# announcements
-
-!SLIDE 
 # Schedule
-* 9:30 registration, breakfast
-* 10:00-10:30 large group - intro
-* 10:45-11:30 session 1
-* 11:45-12:30 session 2
-* 12:30-1:30 lunch
-* 1:30-2:20 session 3
-* 2:30-3:20 session 4
-* 3:30-4:00 large group - wrap up
-* 4:30 - clean up
-* 5pm After party at the Dogpatch Saloon
-
-!SLIDE 
-
-# Workshop Groups
-
+* 9:00-9:30 sign in, breakfast
+* 9:30-10:00 intro
+* 10:00-10:50 session 1
+* 11:00-11:50 session 2
+* 12:00-1:00 lunch out
+* 1:00-1:50 session 3
+* 2:00-2:50 session 4
+* 3:00-4:00 wrap up; final questions</diff>
      <filename>intro.md</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>4c4f7ac299acd05b616ca8668a31f07db56ab225</id>
    </parent>
  </parents>
  <author>
    <name>Sarah Mei</name>
    <email>sarahmei@gmail.com</email>
  </author>
  <url>http://github.com/railsbridge/workshop/commit/2a0843d16f2049d44c80f7b3d871a99a47f8d710</url>
  <id>2a0843d16f2049d44c80f7b3d871a99a47f8d710</id>
  <committed-date>2009-10-04T02:06:52-07:00</committed-date>
  <authored-date>2009-10-04T02:06:52-07:00</authored-date>
  <message>redid intro slides for AoR workshop</message>
  <tree>e86b4bacab451b389fe9118972abef8136e2afa8</tree>
  <committer>
    <name>Sarah Mei</name>
    <email>sarahmei@gmail.com</email>
  </committer>
</commit>
