Merge branch 'master' of github.com:maker/ratchet

diff --combined docs/index.html
index e26a8f9,32acbb4..96c1c6f
--- 1/docs/index.html
--- 2/docs/index.html
+++ b/docs/index.html
@@@ -73,7 -73,7 +73,7 @@@
      <header class="docs-outer-wrapper docs-header">
        <div class="docs-inner-wrapper">
          <hgroup class="docs-header-text">
-           <h2 class="docs-header-subtitle">Prototype iPhone apps with simple HTML, CSS and JS components.</h2>
+           <h2 class="docs-header-subtitle">Prototype iPhone apps with simple HTML, CSS, and JS components.</h2>
            <a data-ignore="push" href="http://maker.github.com/ratchet/ratchet.zip" class="docs-btn" onClick="_gaq.push(['_trackEvent', 'Downloads', 'V1.0']);">Download Ratchet</a>
          </hgroup>
        </div>
@@@ -284,31 -284,31 +284,31 @@@
                <nav class="bar-tab">
                  <ul class="tab-inner">
                    <li class="tab-item active">
 -                    <a>
 +                    <a href="#">
                        <img class="tab-icon" src="img/icon-home.png">
                        <div class="tab-label">Label</div>
                      </a>
                    </li>
                    <li class="tab-item">
 -                    <a>
 +                    <a href="#">
                        <img class="tab-icon" src="img/icon-profile.png">
                        <div class="tab-label">Label</div>
                      </a>
                    </li>
                    <li class="tab-item">
 -                    <a>
 +                    <a href="#">
                        <img class="tab-icon" src="img/icon-messages.png">
                        <div class="tab-label">Label</div>
                      </a>
                    </li>
                    <li class="tab-item">
 -                    <a>
 +                    <a href="#">
                        <img class="tab-icon" src="img/icon-hamburger.png">
                        <div class="tab-label">Label</div>
                      </a>
                    </li>
                    <li class="tab-item">
 -                    <a href="http://starwars.com">
 +                    <a href="#">
                        <img class="tab-icon" src="img/icon-settings.png">
                        <div class="tab-label">Label</div>
                      </a>
@@@ -321,31 -321,31 +321,31 @@@
  &lt;nav class=&quot;bar-tab&quot;&gt;
    &lt;ul class=&quot;tab-inner&quot;&gt;
      &lt;li class=&quot;tab-item active&quot;&gt;
 -      &lt;a href=&quot;&quot;&gt;
 +      &lt;a href=&quot;#&quot;&gt;
          &lt;img class=&quot;tab-icon&quot; src=&quot;img/icon-home.png&quot;&gt;
          &lt;div class=&quot;tab-label&quot;&gt;Label&lt;/div&gt;
        &lt;/a&gt;
      &lt;/li&gt;
      &lt;li class=&quot;tab-item&quot;&gt;
 -      &lt;a href=&quot;&quot;&gt;
 +      &lt;a href=&quot;#&quot;&gt;
          &lt;img class=&quot;tab-icon&quot; src=&quot;img/icon-profile.png&quot;&gt;
          &lt;div class=&quot;tab-label&quot;&gt;Label&lt;/div&gt;
        &lt;/a&gt;
      &lt;/li&gt;
      &lt;li class=&quot;tab-item&quot;&gt;
 -      &lt;a href=&quot;&quot;&gt;
 +      &lt;a href=&quot;#&quot;&gt;
          &lt;img class=&quot;tab-icon&quot; src=&quot;img/icon-messages.png&quot;&gt;
          &lt;div class=&quot;tab-label&quot;&gt;Label&lt;/div&gt;
        &lt;/a&gt;
      &lt;/li&gt;
      &lt;li class=&quot;tab-item&quot;&gt;
 -      &lt;a href=&quot;&quot;&gt;
 +      &lt;a href=&quot;#&quot;&gt;
          &lt;img class=&quot;tab-icon&quot; src=&quot;img/icon-hamburger.png&quot;&gt;
          &lt;div class=&quot;tab-label&quot;&gt;Label&lt;/div&gt;
        &lt;/a&gt;
      &lt;/li&gt;
      &lt;li class=&quot;tab-item&quot;&gt;
 -      &lt;a href=&quot;&quot;&gt;
 +      &lt;a href=&quot;#&quot;&gt;
          &lt;img class=&quot;tab-icon&quot; src=&quot;img/icon-settings.png&quot;&gt;
          &lt;div class=&quot;tab-label&quot;&gt;Label&lt;/div&gt;
        &lt;/a&gt;