resolving merge conflicts

workshop.css

@@ -93,3 +93,12 @@ body {
     font-family: 'Helvetica Neue', Helvetica, sans-serif;
 }
 
+img {
+    padding-left: 324px;
+}
+
+.caption {
+    font-size: 12px;
+    text-align: center;
+}
+

workshop.html

@@ -44,7 +44,10 @@ <h2></h2>
 <div class="presentation">
 
 <div class='slide '>
-<h1>Event Planning for Geeks</h1></div>
+<h1>Event Planning for Geeks</h1><p><img src="images/hackers.jpg" alt="" /></p>
+<p class="caption">John Labovitz</p>
+
+</div>
 <div class='slide '>
 <h1>Who are we?</h1><ul>
 	<li>Audrey Eschright</li>
@@ -78,24 +81,42 @@ <h1>What kind of event do you want to have?</h1><ul>
 	<li>Workshop</li>
 </ul>
 <p><img src="images/txtyme_hacking.jpg" alt="" /></p>
+<p class="caption">Reid Beels</p>
 
 </div>
 <div class='slide '>
 <h1>Assemble and organize your team</h1><p><img src="images/mayor_and_citizens.jpg" alt="" /></p>
+<p class="caption">Reid Beels</p>
 
 </div>
 <div class='slide '>
-<h1>Find a venue for your event</h1></div>
+<h1>Find a venue for your event</h1><p><img src="images/bike_parking.jpg" alt="" /></p>
+<p class="caption">Ankur Naik</p>
+
+</div>
 <div class='slide '>
-<h1>Raise money and pay for things</h1></div>
+<h1>Raise money and pay for things</h1><p>Do you need a fiscal sponsor to handle money?</p>
+<p>Basic financial controls: budget, track, reconcile</p>
+<p>Talking to potential sponsors</p>
+
+</div>
 <div class='slide '>
-<h1>Recruit and manage your volunteers</h1></div>
+<h1>Recruit and manage your volunteers</h1><p><img src="images/volunteer.jpg" alt="" /></p>
+<p class="caption">Reid Beels</p>
+
+</div>
 <div class='slide '>
-<h1>Set the event format and schedule</h1></div>
+<h1>Set the event format and schedule</h1><p><img src="images/schedule_board.jpg" alt="" /></p>
+<p class="caption">Reid Beels</p>
+
+</div>
 <div class='slide '>
 <h1>Make sure the right people will show up</h1></div>
 <div class='slide '>
-<h1>Register the attendees (ticket sales and more)</h1></div>
+<h1>Register the attendees (ticket sales and more)</h1><p><img src="images/registration.jpg" alt="" /></p>
+<p class="caption">Reid Beels</p>
+
+</div>
 <div class='slide '>
 <h1>Get insurance (when you need it), deal with liability, and respond when things go wrong</h1></div>
 <div class='slide '>
@@ -108,6 +129,9 @@ <h1>Set up on site: fun with venue logistics</h1></div>
 <h1>Keep it safe, fun, and welcoming: codes of conduct, after parties, and considerations for serving alcohol</h1></div>
 <div class='slide '>
 <h1>Continue on: keep the momentum once your first event is over</h1></div>
+<div class='slide '>
+<h1>Find out more</h1><p>We started an event planning handbook at</p>
+<p><a href="http://stumptownsyndicate.org/wiki/doku.php?id=event_planning_handbook">http://stumptownsyndicate.org/wiki/doku.php?id=event_planning_handbook</a></p></div>
 
 
 </div><!-- presentation -->

workshop.pdf.html

@@ -46,6 +46,15 @@
     font-family: 'Helvetica Neue', Helvetica, sans-serif;
 }
 
+img {
+    padding-left: 324px;
+}
+
+.caption {
+    font-size: 12px;
+    text-align: center;
+}
+
 
 
 /*
@@ -60,7 +69,10 @@
 <div class="presentation">
 
 <div class='slide '>
-<h1>Event Planning for Geeks</h1></div>
+<h1>Event Planning for Geeks</h1><p><img src="images/hackers.jpg" alt="" /></p>
+<p class="caption">John Labovitz</p>
+
+</div>
 <div class='slide '>
 <h1>Who are we?</h1><ul>
 	<li>Audrey Eschright</li>
@@ -94,24 +106,42 @@ <h1>What kind of event do you want to have?</h1><ul>
 	<li>Workshop</li>
 </ul>
 <p><img src="images/txtyme_hacking.jpg" alt="" /></p>
+<p class="caption">Reid Beels</p>
 
 </div>
 <div class='slide '>
 <h1>Assemble and organize your team</h1><p><img src="images/mayor_and_citizens.jpg" alt="" /></p>
+<p class="caption">Reid Beels</p>
 
 </div>
 <div class='slide '>
-<h1>Find a venue for your event</h1></div>
+<h1>Find a venue for your event</h1><p><img src="images/bike_parking.jpg" alt="" /></p>
+<p class="caption">Ankur Naik</p>
+
+</div>
 <div class='slide '>
-<h1>Raise money and pay for things</h1></div>
+<h1>Raise money and pay for things</h1><p>Do you need a fiscal sponsor to handle money?</p>
+<p>Basic financial controls: budget, track, reconcile</p>
+<p>Talking to potential sponsors</p>
+
+</div>
 <div class='slide '>
-<h1>Recruit and manage your volunteers</h1></div>
+<h1>Recruit and manage your volunteers</h1><p><img src="images/volunteer.jpg" alt="" /></p>
+<p class="caption">Reid Beels</p>
+
+</div>
 <div class='slide '>
-<h1>Set the event format and schedule</h1></div>
+<h1>Set the event format and schedule</h1><p><img src="images/schedule_board.jpg" alt="" /></p>
+<p class="caption">Reid Beels</p>
+
+</div>
 <div class='slide '>
 <h1>Make sure the right people will show up</h1></div>
 <div class='slide '>
-<h1>Register the attendees (ticket sales and more)</h1></div>
+<h1>Register the attendees (ticket sales and more)</h1><p><img src="images/registration.jpg" alt="" /></p>
+<p class="caption">Reid Beels</p>
+
+</div>
 <div class='slide '>
 <h1>Get insurance (when you need it), deal with liability, and respond when things go wrong</h1></div>
 <div class='slide '>
@@ -124,6 +154,9 @@ <h1>Set up on site: fun with venue logistics</h1></div>
 <h1>Keep it safe, fun, and welcoming: codes of conduct, after parties, and considerations for serving alcohol</h1></div>
 <div class='slide '>
 <h1>Continue on: keep the momentum once your first event is over</h1></div>
+<div class='slide '>
+<h1>Find out more</h1><p>We started an event planning handbook at</p>
+<p><a href="http://stumptownsyndicate.org/wiki/doku.php?id=event_planning_handbook">http://stumptownsyndicate.org/wiki/doku.php?id=event_planning_handbook</a></p></div>
 
 
   </div> <!-- presentation -->

workshop.textile

@@ -11,13 +11,26 @@ body {
     font-family: 'Helvetica Neue', Helvetica, sans-serif;
 }
 
+img {
+    padding-left: 324px;
+}
+
+.caption {
+    font-size: 12px;
+    text-align: center;
+}
+
 %end
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Start Presentation
 
 h1. Event Planning for Geeks
 
+!images/hackers.jpg!
+
+p(caption). John Labovitz
+
 h1. Who are we?
 
 * Audrey Eschright
@@ -48,13 +61,19 @@ h1. What kind of event do you want to have?
 
 !images/txtyme_hacking.jpg!
 
+p(caption). Reid Beels
+
 h1. Assemble and organize your team
 
 !images/mayor_and_citizens.jpg!
 
+p(caption). Reid Beels
+
 h1. Find a venue for your event
 
+!images/bike_parking.jpg!
 
+p(caption). Ankur Naik
 
 h1. Raising money 
 
@@ -102,19 +121,25 @@ Don't represent yourself as being able to take tax-deductible donations if you a
 
 h1. Recruit and manage your volunteers
 
+!images/volunteer.jpg!
 
+p(caption). Reid Beels
 
 h1. Set the event format and schedule
 
+!images/schedule_board.jpg!
 
+p(caption). Reid Beels
 
 h1. Make sure the right people will show up
 
 
 
 h1. Register the attendees (ticket sales and more)
 
+!images/registration.jpg!
 
+p(caption). Reid Beels
 
 h1. Get insurance (when you need it), deal with liability, and respond when things go wrong
 
@@ -147,3 +172,8 @@ If you want your event to be different from that status quo, you'll need to acti
 
 h1. Continue on: keep the momentum once your first event is over
 
+h1. Find out more
+
+We started an event planning handbook at
+
+"http://stumptownsyndicate.org/wiki/doku.php?id=event_planning_handbook":http://stumptownsyndicate.org/wiki/doku.php?id=event_planning_handbook