resolve conflicts again ...

diff --git a/public/index.html b/public/index.html
index 385171c0fc8075bd690f8ba283f2db9113a2cc2d..40e4236df01dd046d8c90ed21d21cd65816d2f64 100755 (executable)
--- a/public/index.html
+++ b/public/index.html
@@ -6,7 +6,6 @@
                <link rel="stylesheet" href="/assets/css/include.css" type="text/css" media="screen" />
                <script type="text/javascript" src="/assets/js/modernizr.custom.js"></script>
                <script type="text/javascript" src="/assets/js/load.js"></script>
-
                <script type="text/javascript" src="http://use.typekit.com/cbx6gxx.js"></script>
                <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 
@@ -52,7 +51,6 @@
                <div id="messages" class="page"><span id="PROTO_message" class="__type__">__msg__</span></div>
                <div class="content">
 
-
                        <style>
                                /* The is here is because it's related less to "styling" and more to UI "behavior" */
                                .page { display: none; }
@@ -106,7 +104,7 @@
                                        <div class="grid-6">
                                                <h3 class="heading">Check out our Screencasts</h3>
                                                <div class="video-wrapper">
-                                                                       </div>
+                                                       <iframe src="http://player.vimeo.com/video/30647271?title=0&amp;byline=0&amp;portrait=0&amp;color=367da9" width="460" height="259" frameborder="0" webkitAllowFullScreen allowFullScreen></iframe>              </div>
                                                </div>
                                        <div class="grid-6">
                                                <h3 class="heading">We currently support the following schools</h3>