10 files changed, 323 insertions, 217 deletions

diff --git a/images/io2013/google-io-lockup-1.png b/images/io2013/google-io-lockup-1.png
new file mode 100644
index 0000000..38b9e92
--- /dev/null
+++ b/images/io2013/google-io-lockup-1.png
diff --git a/images/io2013/google-io-lockup-2.png b/images/io2013/google-io-lockup-2.png
new file mode 100644
index 0000000..d076cc1
--- /dev/null
+++ b/images/io2013/google-io-lockup-2.png
diff --git a/slide_config.js b/slide_config.js
index 8d370fd..0d9b7c6 100644
--- a/slide_config.js
+++ b/slide_config.js
@@ -23,7 +23,7 @@ var SLIDE_CONFIG = {
   // Author information
   presenters: [{
     name: 'Firstname Lastname',
-    company: 'Job Title, Google',
+    company: 'Job Title<br>Google',
     gplus: 'http://plus.google.com/1234567890',
     twitter: '@yourhandle',
     www: 'http://www.you.com',
diff --git a/template.html b/template.html
index 93eb2a0..b4e7d33 100644
--- a/template.html
+++ b/template.html
@@ -365,13 +365,13 @@ function helloWorld(world) {
       <h2>Slide with Iframe</h2>
     </hgroup>
     <article>
-      <iframe data-src="http://www.google.com/doodle4google/history.html"></iframe>
+      <iframe data-src="http://www.google.com/doodle4google/resources/history.html"></iframe>
     </article>
   </slide>
 
   <slide>
     <article>
-      <iframe data-src="http://www.google.com/doodle4google/history.html"></iframe>
+      <iframe data-src="http://www.google.com/doodle4google/resources/history.html"></iframe>
     </article>
   </slide>
 
diff --git a/theme/css/default.css b/theme/css/default.css
index e7668f6..ce6fda5 100644
--- a/theme/css/default.css
+++ b/theme/css/default.css
@@ -67,13 +67,13 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
 /**
  * Base SlideDeck Styles
  */
-/* line 50, ../scss/_base.scss */
+/* line 52, ../scss/_base.scss */
 html {
   height: 100%;
   overflow: hidden;
 }
 
-/* line 55, ../scss/_base.scss */
+/* line 57, ../scss/_base.scss */
 body {
   margin: 0;
   padding: 0;
@@ -93,22 +93,22 @@ body {
   -o-transition: opacity 800ms ease-in 100ms;
   transition: opacity 800ms ease-in 100ms;
 }
-/* line 71, ../scss/_base.scss */
+/* line 73, ../scss/_base.scss */
 body.loaded {
   opacity: 1 !important;
 }
 
-/* line 76, ../scss/_base.scss */
+/* line 78, ../scss/_base.scss */
 input, button {
   vertical-align: middle;
 }
 
-/* line 80, ../scss/_base.scss */
+/* line 82, ../scss/_base.scss */
 slides > slide[hidden] {
   display: none !important;
 }
 
-/* line 84, ../scss/_base.scss */
+/* line 86, ../scss/_base.scss */
 slides {
   width: 100%;
   height: 100%;
@@ -137,7 +137,7 @@ slides {
   transition: opacity 800ms ease-in 100ms;
 }
 
-/* line 96, ../scss/_base.scss */
+/* line 98, ../scss/_base.scss */
 slides > slide {
   display: block;
   position: absolute;
@@ -183,21 +183,21 @@ slide.fill img {
 /**
  * Theme Styles
  */
-/* line 58, ../scss/default.scss */
+/* line 22, ../scss/default.scss */
 ::selection {
   color: white;
   background-color: #ffd14d;
   text-shadow: none;
 }
 
-/* line 64, ../scss/default.scss */
+/* line 28, ../scss/default.scss */
 ::-webkit-scrollbar {
   height: 16px;
   overflow: visible;
   width: 16px;
 }
 
-/* line 69, ../scss/default.scss */
+/* line 33, ../scss/default.scss */
 ::-webkit-scrollbar-thumb {
   background-color: rgba(0, 0, 0, 0.1);
   background-clip: padding-box;
@@ -210,35 +210,35 @@ slide.fill img {
   border-width: 1px 1px 1px 6px;
 }
 
-/* line 78, ../scss/default.scss */
+/* line 42, ../scss/default.scss */
 ::-webkit-scrollbar-thumb:hover {
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-/* line 81, ../scss/default.scss */
+/* line 45, ../scss/default.scss */
 ::-webkit-scrollbar-button {
   height: 0;
   width: 0;
 }
 
-/* line 85, ../scss/default.scss */
+/* line 49, ../scss/default.scss */
 ::-webkit-scrollbar-track {
   background-clip: padding-box;
   border: solid transparent;
   border-width: 0 0 0 4px;
 }
 
-/* line 90, ../scss/default.scss */
+/* line 54, ../scss/default.scss */
 ::-webkit-scrollbar-corner {
   background: transparent;
 }
 
-/* line 94, ../scss/default.scss */
+/* line 58, ../scss/default.scss */
 body {
   background: black;
 }
 
-/* line 98, ../scss/default.scss */
+/* line 62, ../scss/default.scss */
 slides > slide {
   display: none;
   font-family: 'Open Sans', Arial, sans-serif;
@@ -259,49 +259,49 @@ slides > slide {
   -o-transition: all 0.6s ease-in-out;
   transition: all 0.6s ease-in-out;
 }
-/* line 119, ../scss/default.scss */
+/* line 83, ../scss/default.scss */
 slides > slide.far-past {
   display: none;
 }
-/* line 126, ../scss/default.scss */
+/* line 90, ../scss/default.scss */
 slides > slide.past {
   display: block;
   opacity: 0;
 }
-/* line 133, ../scss/default.scss */
+/* line 97, ../scss/default.scss */
 slides > slide.current {
   display: block;
   opacity: 1;
 }
-/* line 139, ../scss/default.scss */
+/* line 103, ../scss/default.scss */
 slides > slide.current .auto-fadein {
   opacity: 1;
 }
-/* line 143, ../scss/default.scss */
+/* line 107, ../scss/default.scss */
 slides > slide.current .gdbar {
   -webkit-background-size: 100% 100%;
   -moz-background-size: 100% 100%;
   -o-background-size: 100% 100%;
   background-size: 100% 100%;