resolve conflicts

diff --cc bootstrap-1.0.0.css
index d84e5777953004e57cffda0cf82b2a5992a539d3,7ec9acc0bd3034d9a51a9bed336e22ee25752141..08bbb7bba8df4aa13bfa1181a748f88a425dc15f
--- 1/bootstrap-1.0.0.css
--- 2/bootstrap-1.0.0.css
+++ b/bootstrap-1.0.0.css
@@@ -6,7 -6,7 +6,7 @@@
   * http://www.apache.org/licenses/LICENSE-2.0
   *
   * Designed and built with all the love in the world @twitter by @mdo and @fat.
-  * Date: Sun Aug 21 20:38:48 PDT 2011
 - * Date: Sun Aug 21 20:47:15 PDT 2011
++ * Date: Sun Aug 21 20:50:48 PDT 2011
   */
  /* Reset.less
   * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here     that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@@ -977,6 -1008,13 +1008,13 @@@ form.form-stacked .inputs-list li labe
    font-weight: normal;
    padding-top: 0;
  }
 -form.form-stacked div.error {
++form.form-stacked .error {
+   padding-top: 10px;
+   padding-bottom: 10px;
+   padding-left: 10px;
+   margin-top: 0;
+   margin-left: -10px;
+ }
  form.form-stacked .actions {
    margin-left: -20px;
    padding-left: 20px;

diff --cc bootstrap-1.0.0.min.css
index 38a865b4cdd0980816e9be1b1b3389945c7e1e8a,f30ba03326dc4c2eea8dd62c7586af8e06c46e60..c861689c649d68c3bae2802e69804b7b25f3f0e2
--- 1/bootstrap-1.0.0.min.css
--- 2/bootstrap-1.0.0.min.css
+++ b/bootstrap-1.0.0.min.css
@@@ -131,6 -132,7 +132,7 @@@ form.form-stacked legend{margin-left:0;
  form.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;}
  form.form-stacked .clearfix{margin-bottom:9px;}form.form-stacked .clearfix div.input{margin-left:0;}
  form.form-stacked .inputs-list{margin-bottom:0;}form.form-stacked .inputs-list li{padding-top:0;}form.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;}
 -form.form-stacked div.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;}
++form.form-stacked .error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;}
  form.form-stacked .actions{margin-left:-20px;padding-left:20px;}
  table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;text-align:left;vertical-align:middle;border-bottom:1px solid #ddd;}
  table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;}

diff --cc docs/index.html
index 3ad2bb08bb5265a4a7f05d923bba993779113fce,311edc09344d8f78991daaafefc69ccce363b88c..983ea7d87165f8efbd7e1338b3e8c536741dac10
--- 1/docs/index.html
--- 2/docs/index.html
+++ b/docs/index.html
@@@ -572,298 -596,340 +596,300 @@@
  
  
  
+ <!-- Forms
+ ================================================== -->
  <section id="forms">
- 
- <div class="page-header">
-   <h1>Forms</h1>
- </div>
- 
- <div class="row">
-   <div class="span4 columns">
-     <h2>Default styles</h2>
-     <p>All forms are given default styles to present them in a readable and scalable way. Styles are provided for text inputs, select lists, textareas, radio buttons and checkboxes, and buttons.</p>
-   </div>
-   <div class="span12 columns">
-   <form>
-     <fieldset>
-       <legend>Example form legend</legend>
-       <div class="clearfix">
-         <label for="">X-Large Input</label>
-         <div class="input">
-           <input class="xlarge" id="xlInput" name="xlInput" size="30" type="text" />
-         </div>
-       </div> <!-- /clearfix -->
-       <div class="clearfix">
-         <label for="">Select</label>
-         <div class="input">
-           <select>
-             <option>1</option>
-             <option>2</option>
-             <option>3</option>
-             <option>4</option>
-             <option>5</option>
-           </select>
-         </div>
-       </div> <!-- /clearfix -->
-       <div class="clearfix">
-         <label for="">Select</label>
-         <div class="input">
-           <select class="medium">
-             <option>1</option>
-             <option>2</option>
-             <option>3</option>
-             <option>4</option>
-             <option>5</option>
-           </select>
-         </div>
-       </div> <!-- /clearfix -->
-       <div class="clearfix">
-         <label>Uneditable Input</label>
-         <div class="input">
-           <span class="uneditable-input">Some Value Here</span>
-         </div>
-       </div> <!-- /clearfix -->
-       <div class="clearfix">
-         <label for="disabledInput">Disabled Input</label>
-         <div class="input">
-           <input class="xlarge disabled" id="disabledInput" name="disabledInput" size="30" type="text" placeholder="Disabled input here… carry on." disabled />
-         </div>
-       </div> <!-- /clearfix -->
-       <div class="clearfix error">
-         <label for="xlInput">X-Large Input</label>
-         <div class="input">
-           <input class="xlarge error" id="xlInput" name="xlInput" size="30" type="text" />
-           <span class="help-inline">Small snippet of help text</span>
-         </div>
-       </div> <!-- /clearfix -->
-     </fieldset>
-     <fieldset>
-       <legend>Example form legend</legend>
-       <div class="clearfix">
-         <label for="prependedInput">Prepended Text</label>
-         <div class="input">
-           <div class="input-prepend">
-             <span class="add-on">@</span>
-             <input class="medium" id="prependedInput" name="prependedInput" size="16" type="text" />
-           </div>
-         </div>
-       </div> <!-- /clearfix -->
-       <div class="clearfix">
-         <label for="prependedInput2">Prepended Checkbox</label>
-         <div class="input">
-           <div class="input-prepend">
-             <label class="add-on"><input type="checkbox" name="" id="" value="" /></label>
-             <input class="mini" id="prependedInput2" name="prependedInput2" size="16" type="text" />
-           </div>
-         </div>
-       </div> <!-- /clearfix -->
-       <div class="clearfix">
-         <label for="appendedInput">Appended Checkbox</label>
-         <div class="input">
-           <div class="input-append">
-             <input class="mini" id="appendedInput" name="appendedInput" size="16" type="text" />
-             <label class="add-on active"><input type="checkbox" name="" id="" value="" checked="checked" /></label>
-           </div>
-         </div>
-       </div> <!-- /clearfix -->
-       <div class="clearfix">
-         <label for="xlInput">File Input</label>
-         <div class="input">
-           <input class="input-file" id="fileInput" name="fileInput" type="file" />
-         </div>
-       </div> <!-- /clearfix -->
-     </fieldset>
-     <fieldset>
-       <legend>Example form legend</legend>
-       <div class="clearfix">
-         <label id="optionsCheckboxes">List of Options</label>
-         <div class="input">
-           <ul class="inputs-list">
-             <li>
-               <label>
-                 <input type="checkbox" name="optionsCheckboxes" value="option1" />
-                 <span>Option one is this and that&mdash;be sure to include why it’s great</span>
-               </label>
-             </li>
-             <li>
-               <label>
-                 <input type="checkbox" name="optionsCheckboxes" value="option2" />
-                 <span>Option two can also be checked and included in form results</span>
-               </label>
-             </li>
-             <li>
-               <label>
-                 <input type="checkbox" name="optionsCheckboxes" value="option2" />
-                 <span>Option three can&mdash;yes, you guessed it&mdash;also be checked and included in form results</span>
-               </label>
-             </li>
-             <li>
-               <label class="disabled">
-                 <input type="checkbox" name="optionsCheckboxes" value="option2" disabled />
-                 <span>Option four cannot be checked as it is disabled.</span>
-               </label>
-             </li>
-           </ul>
-           <span class="help-block">
-             <strong>Note:</strong> Labels surround all the options for much larger click areas and a more usable form.
-           </span>
-         </div>
-       </div> <!-- /clearfix -->
-       <div class="clearfix">
-         <label>Date Range</label>
-         <div class="input">
-           <div class="inline-inputs">
-             <input class="small" type="text" value="May 1, 2011" />
-             <input class="mini" type="text" value="12:00am" />
-             to
-             <input class="small" type="text" value="May 8, 2011" />
-             <input class="mini" type="text" value="11:59pm" />
-             <span class="help-inline">All times are shown as Pacific Standard Time (GMT -08:00).</span>
-           </div>
-         </div>
-       </div> <!-- /clearfix -->
-       <div class="clearfix">
-         <label for="textarea">Textarea</label>
-         <div class="input">
-           <textarea class="xxlarge" id="textarea" name="textarea"></textarea>
-           <span class="help-block">
-             Block of help text to describe the field above if need be.
-           </span>
-         </div>
-       </div> <!-- /clearfix -->
-       <div class="clearfix">
-         <label id="optionsRadio">List of Options</label>
-         <div class="input">
-           <ul class="inputs-list">
-             <li>
-               <label>
-                 <input type="checkbox" name="optionsCheckboxes" value="option1" />
-                 <span>Option one is this and that&mdash;be sure to include why it’s great</span>
-               </label>
-             </li>
-             <li>
-               <label>
-                 <input type="checkbox" name="optionsCheckboxes" value="option2" />
-                 <span>Option two can also be checked and included in form results</span>
-               </label>
-             </li>
-           </ul>
-         </div>
-       </div> <!-- /clearfix -->
-       <div class="actions">
-         <button type="submit" class="btn primary">Save Changes</button>
-         <button type="reset" class="btn">Cancel</button>
-       </div>
-     </fieldset>
-   </form>
-   </div>
- </div>
- 
- <br />
- 
- <div class="row">
-   <div class="span4 columns">
-     <h2>Stacked forms</h2>
-     <p>Add <code>.form-stacked</code> to your form’s HTML and you’ll have labels on top of their fields instead of to their left. This works great if your forms are short or you have two columns of inputs for heavier forms.</p>
-   </div>
-   <div class="span12 columns">
-     <form action="" class="form-stacked">
-       <fieldset>
-         <legend>Example form legend</legend>
-         <div class="clearfix">
-           <label for="">X-Large Input</label>
-           <div class="input">
-             <input class="xlarge" id="xlInput" name="xlInput" size="30" type="text" />
-           </div>
-         </div> <!-- /clearfix -->
-         <div class="clearfix">
-           <label for="">Select</label>
-           <div class="input">
-             <select>
-               <option>1</option>
-               <option>2</option>
-               <option>3</option>
-               <option>4</option>
-               <option>5</option>
-             </select>
-           </div>
-         </div> <!-- /clearfix -->
-       </fieldset>
-       <fieldset>
-         <legend>Example form legend</legend>
-         <div class="clearfix">
-           <label id="optionsCheckboxes">List of Options</label>
-           <div class="input">
-             <ul class="inputs-list">
-               <li>
-                 <label>
-                   <input type="checkbox" name="optionsCheckboxes" value="option1" />
-                   <span>Option one is this and that&mdash;be sure to include why it’s great</span>
-                 </label>
-               </li>
-               <li>
-                 <label>
-                   <input type="checkbox" name="optionsCheckboxes" value="option2" />
-                   <span>Option two can also be checked and included in form results</span>
-                 </label>
-               </li>
-             </ul>
-             <span class="help-block">
-               <strong>Note:</strong> Labels surround all the options for much larger click areas and a more usable form.
-             </span>
-           </div>
-         </div> <!-- /clearfix -->
-       </fieldset>
-       <div class="actions">
-         <button type="submit" class="btn primary">Save Changes</button>
-         <button type="reset" class="btn">Cancel</button>
-       </div>
-     </form>
-   </div>
- </div>
- 
- <div class="row">
-   <div class="span4 columns">
-     <h2>Buttons</h2>
-     <p>As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.</p>
-     <p>All buttons default to a light gray style, but a blue <code>.primary</code> class is available. Plus, rolling your own styles is easy peasy.</p>
+   <div class="page-header">
+     <h1>Forms</h1>
    </div>
-   <div class="span12 columns">
-     <h3>Example buttons</h3>
-     <p>Button styles can be applied to anything with the <code>.btn</code> applied. Typically you’ll want to apply these to only <code>&lt;a&gt;</code>, <code>&lt;button&gt;</code>, and select <code>&lt;input&gt;</code> elements. Here’s how it looks:</p>
-     <div class="well" style="padding: 14px 19px;">
+   <div class="row">
+     <div class="span4 columns">
+       <h2>Default styles</h2>
+       <p>All forms are given default styles to present them in a readable and scalable way. Styles are provided for text inputs, select lists, textareas, radio buttons and checkboxes, and buttons.</p>
+     </div>
+     <div class="span12 columns">
        <form>
-         <button type="submit" class="btn primary">Submit</button>
-         <button type="submit" class="btn">Cancel</button>
+         <fieldset>
+           <legend>Example form legend</legend>
+           <div class="clearfix">
+             <label for="">X-Large Input</label>
+             <div class="input">
+               <input class="xlarge" id="xlInput" name="xlInput" size="30" type="text" />
+             </div>
+           </div> <!-- /clearfix -->
+           <div class="clearfix">
+             <label for="">Select</label>
+             <div class="input">
+               <select>
+                 <option>1</option>
+                 <option>2</option>
+                 <option>3</option>
+                 <option>4</option>
+                 <option>5</option>
+               </select>
+             </div>
+           </div> <!-- /clearfix -->
+           <div class="clearfix">
+             <label for="">Select</label>
+             <div class="input">
+               <select class="medium">
+                 <option>1</option>
+                 <option>2</option>
+                 <option>3</option>
+                 <option>4</option>
+                 <option>5</option>
+               </select>
+             </div>
+           </div> <!-- /clearfix -->
+           <div class="clearfix">
+             <label>Uneditable Input</label>
+             <div class="input">
+               <span class="uneditable-input">Some Value Here</span>
+             </div>
+           </div> <!-- /clearfix -->
+           <div class="clearfix">
+             <label for="disabledInput">Disabled Input</label>
+             <div class="input">
+               <input class="xlarge disabled" id="disabledInput" name="disabledInput" size="30" type="text" placeholder="Disabled input here… carry on." disabled />
+             </div>
+           </div> <!-- /clearfix -->
+           <div class="clearfix error">
+             <label for="xlInput">X-Large Input</label>
+             <div class="input">
+               <input class="xlarge error" id="xlInput" name="xlInput" size="30" type="text" />
+               <span class="help-inline">Small snippet of help text</span>
+             </div>
+           </div> <!-- /clearfix -->
+         </fieldset>
+         <fieldset>
+           <legend>Example form legend</legend>
+           <div class="clearfix">
+             <label for="prependedInput">Prepended Text</label>
+             <div class="input">
+               <div class="input-prepend">
+                 <span class="add-on">@</span>
+                 <input class="medium" id="prependedInput" name="prependedInput" size="16" type="text" />
+               </div>
+             </div>
+           </div> <!-- /clearfix -->
+           <div class="clearfix">
+             <label for="prependedInput2">Prepended Checkbox</label>
+             <div class="input">
+               <div class="input-prepend">
+                 <label class="add-on"><input type="checkbox" name="" id="" value="" /></label>
+                 <input class="mini" id="prependedInput2" name="prependedInput2" size="16" type="text" />
+               </div>
+             </div>
+           </div> <!-- /clearfix -->
+           <div class="clearfix">
+             <label for="appendedInput">Appended Checkbox</label>
+             <div class="input">
+               <div class="input-append">
+                 <input class="mini" id="appendedInput" name="appendedInput" size="16" type="text" />
+                 <label class="add-on active"><input type="checkbox" name="" id="" value="" checked="checked" /></label>
+               </div>
+             </div>
+           </div> <!-- /clearfix -->
+           <div class="clearfix">
+             <label for="xlInput">File Input</label>
+             <div class="input">
+               <input class="input-file" id="fileInput" name="fileInput" type="file" />
+             </div>
+           </div> <!-- /clearfix -->
+         </fieldset>
+         <fieldset>
+           <legend>Example form legend</legend>
+           <div class="clearfix">
+             <label id="optionsCheckboxes">List of Options</label>
+             <div class="input">
+               <ul class="inputs-list">
+                 <li>
+                   <label>
+                     <input type="checkbox" name="optionsCheckboxes" value="option1" />
+                     <span>Option one is this and that&mdash;be sure to include why it’s great</span>
+                   </label>
+                 </li>
+                 <li>
+                   <label>
+                     <input type="checkbox" name="optionsCheckboxes" value="option2" />
+                     <span>Option two can also be checked and included in form results</span>
+                   </label>
+                 </li>
+                 <li>
+                   <label>
+                     <input type="checkbox" name="optionsCheckboxes" value="option2" />
+                     <span>Option three can&mdash;yes, you guessed it&mdash;also be checked and included in form results</span>
+                   </label>
+                 </li>
+                 <li>
+                   <label class="disabled">
+                     <input type="checkbox" name="optionsCheckboxes" value="option2" disabled />
+                     <span>Option four cannot be checked as it is disabled.</span>
+                   </label>
+                 </li>
+               </ul>
+               <span class="help-block">
+                 <strong>Note:</strong> Labels surround all the options for much larger click areas and a more usable form.
+               </span>
+             </div>
+           </div> <!-- /clearfix -->
+           <div class="clearfix">
+             <label>Date Range</label>
+             <div class="input">
+               <div class="inline-inputs">
+                 <input class="small" type="text" value="May 1, 2011" />
+                 <input class="mini" type="text" value="12:00am" />
+                 to
+                 <input class="small" type="text" value="May 8, 2011" />
+                 <input class="mini" type="text" value="11:59pm" />
+                 <span class="help-inline">All times are shown as Pacific Standard Time (GMT -08:00).</span>
+               </div>
+             </div>
+           </div> <!-- /clearfix -->
+           <div class="clearfix">
+             <label for="textarea">Textarea</label>
+             <div class="input">
+               <textarea class="xxlarge" id="textarea" name="textarea"></textarea>
+               <span class="help-block">
+                 Block of help text to describe the field above if need be.
+               </span>
+             </div>
+           </div> <!-- /clearfix -->
+           <div class="clearfix">
+             <label id="optionsRadio">List of Options</label>
+             <div class="input">
+               <ul class="inputs-list">
+                 <li>
+                   <label>
+                     <input type="checkbox" name="optionsCheckboxes" value="option1" />
+                     <span>Option one is this and that&mdash;be sure to include why it’s great</span>
+                   </label>
+                 </li>
+                 <li>
+                   <label>
+                     <input type="checkbox" name="optionsCheckboxes" value="option2" />
+                     <span>Option two can also be checked and included in form results</span>
+                   </label>
+                 </li>
+               </ul>
+             </div>
+           </div> <!-- /clearfix -->
+           <div class="actions">
+             <button type="submit" class="btn primary">Save Changes</button>
+             <button type="reset" class="btn">Cancel</button>
+           </div>
+         </fieldset>
        </form>
      </div>
-     <h3>Alternate sizes</h3>
-     <p>Fancy larger or smaller buttons? Have at it!</p>
-     <div class="well">
-       <a href="#" class="btn large primary">Primary action</a>
-       <a href="#" class="btn large">Action</a>
+   </div> <!-- /row -->
+ 
+   <br />
+ 
 -<<<<<<< .merge_file_CXRuoN
+   <div class="row">
+     <div class="span4 columns">
+       <h2>Stacked forms</h2>
+       <p>Add <code>.form-stacked</code> to your form’s HTML and you’ll have labels on top of their fields instead of to their left. This works great if your forms are short or you have two columns of inputs for heavier forms.</p>
 -=======
 -<div class="row">
 -  <div class="span4 columns">
 -    <h2>Buttons</h2>
 -    <p>As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.</p>
 -    <p>All buttons default to a light gray style, but a blue <code>.primary</code> class is available. Plus, rolling your own styles is easy peasy.</p>
 -  </div>
 -  <div class="span12 columns">
 -    <h3>Example buttons</h3>
 -    <p>Button styles can be applied to anything with the <code>.btn</code> applied. Typically you’ll want to apply these to only <code>&lt;a&gt;</code>, <code>&lt;button&gt;</code>, and select <code>&lt;input&gt;</code> elements. Here’s how it looks:</p>
 -    <div class="well" style="padding: 14px 19px;">
 -      <form>
 -        <button type="submit" class="btn primary">Submit</button>
 -        <button type="submit" class="btn">Cancel</button>
 -      </form>
 -    </div>
 -    <h3>Alternate sizes</h3>
 -    <p>Fancy larger or smaller buttons? Have at it!</p>
 -    <div class="well">
 -      <a href="#" class="btn large primary">Primary action</a>
 -      <a href="#" class="btn large">Action</a>
 ->>>>>>> .merge_file_hNGrGI
      </div>
-     <div class="well" style="padding: 16px 19px;">
-       <a href="#" class="btn small primary">Primary action</a>
-       <a href="#" class="btn small">Action</a>
+     <div class="span12 columns">
+       <form action="" class="form-stacked">
+         <fieldset>
+           <legend>Example form legend</legend>
+           <div class="clearfix">
+             <label for="">X-Large Input</label>
+             <div class="input">
+               <input class="xlarge" id="xlInput" name="xlInput" size="30" type="text" />
+             </div>
+           </div> <!-- /clearfix -->
+           <div class="clearfix">
+             <label for="">Select</label>
+             <div class="input">
+               <select>
+                 <option>1</option>
+                 <option>2</option>
+                 <option>3</option>
+                 <option>4</option>
+                 <option>5</option>
+               </select>
+             </div>
+           </div> <!-- /clearfix -->
+         </fieldset>
+         <fieldset>
+           <legend>Example form legend</legend>
+           <div class="clearfix error">
+             <label for="xlInput">X-Large Input</label>
+             <div class="input">
+               <input class="xlarge error" id="xlInput" name="xlInput" size="30" type="text" />
+               <span class="help-inline">Small snippet of help text</span>
+             </div>
+           </div> <!-- /clearfix -->
+           <div class="clearfix">
+             <label id="optionsCheckboxes">List of Options</label>
+             <div class="input">
+               <ul class="inputs-list">
+                 <li>
+                   <label>
+                     <input type="checkbox" name="optionsCheckboxes" value="option1" />
+                     <span>Option one is this and that&mdash;be sure to include why it’s great</span>
+                   </label>
+                 </li>
+                 <li>
+                   <label>
+                     <input type="checkbox" name="optionsCheckboxes" value="option2" />
+                     <span>Option two can also be checked and included in form results</span>
+                   </label>
+                 </li>
+               </ul>
+               <span class="help-block">
+                 <strong>Note:</strong> Labels surround all the options for much larger click areas and a more usable form.
+               </span>
+             </div>
+           </div> <!-- /clearfix -->
+         </fieldset>
+         <div class="actions">
+           <button type="submit" class="btn primary">Save Changes</button>
+           <button type="reset" class="btn">Cancel</button>
+         </div>
+       </form>
      </div>
-     <h3>Disabled state</h3>
-     <p>For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s <code>.disabled</code> for links and <code>:disabled</code> for <code>&lt;button&gt;</code> elements.</p>
-     <p><strong>Note:</strong> If you're developing for older browsers like IE8 or below -- you're going to want to use the <code>.disabled</code> class for <code>&lt;button&gt;</code> elements as well.
-     <h4>Links</h4>
-     <div class="well">
-       <a href="#" class="btn large primary disabled">Primary action</a>
-       <a href="#" class="btn large disabled">Action</a>
 -<<<<<<< .merge_file_CXRuoN
+   </div> <!-- /row -->
+ 
+   <div class="row">
+     <div class="span4 columns">
+       <h2>Buttons</h2>
+       <p>As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.</p>
+       <p>All buttons default to a light gray style, but a blue <code>.primary</code> class is available. Plus, rolling your own styles is easy peasy.</p>
      </div>
-     <h4>Buttons</h4>
-     <div class="well">
-       <form>
-         <button class="btn large primary disabled" disabled>Primary action</button>
-         <button class="btn large disabled" disabled>Action</button>
-       </form>
+     <div class="span12 columns">
+       <h3>Example buttons</h3>
+       <p>Button styles can be applied to anything with the <code>.btn</code> applied. Typically you’ll want to apply these to only <code>&lt;a&gt;</code>, <code>&lt;button&gt;</code>, and select <code>&lt;input&gt;</code> elements. Here’s how it looks:</p>
+       <div class="well" style="padding: 14px 19px;">
+         <button type="submit" class="btn primary">Submit</button>
+         <button type="submit" class="btn">Cancel</button>
+       </div>
+       <h3>Alternate sizes</h3>
+       <p>Fancy larger or smaller buttons? Have at it!</p>
+       <div class="well">
+         <a href="#" class="btn large primary">Primary action</a>
+         <a href="#" class="btn large">Action</a>
+       </div>
+       <div class="well" style="padding: 16px 19px;">
+         <a href="#" class="btn small primary">Primary action</a>
+         <a href="#" class="btn small">Action</a>
+       </div>
+       <h3>Disabled state</h3>
+       <p>For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s <code>.disabled</code> for links and <code>:disabled</code> for <code>&lt;button&gt;</code> elements.</p>
+       <h4>Links</h4>
+       <div class="well">
+         <a href="#" class="btn large primary disabled">Primary action</a>
+         <a href="#" class="btn large disabled">Action</a>
+       </div>
+       <h4>Buttons</h4>
+       <div class="well">
+         <button class="btn large primary" disabled>Primary action</button>
+         <button class="btn large" disabled>Action</button>
+       </div>
 -=======
 -    <h3>Disabled state</h3>
 -    <p>For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s <code>.disabled</code> for links and <code>:disabled</code> for <code>&lt;button&gt;</code> elements.</p>
 -    <p><strong>Note:</strong> If you're developing for older browsers like IE8 or below -- you're going to want to use the <code>.disabled</code> class for <code>&lt;button&gt;</code> elements as well.
 -    <h4>Links</h4>
 -    <div class="well">
 -      <a href="#" class="btn large primary disabled">Primary action</a>
 -      <a href="#" class="btn large disabled">Action</a>
 -    </div>
 -    <h4>Buttons</h4>
 -    <div class="well">
 -      <form>
 -        <button class="btn large primary disabled" disabled>Primary action</button>
 -        <button class="btn large disabled" disabled>Action</button>
 -      </form>
 ->>>>>>> .merge_file_hNGrGI
      </div>
-   </div>
- </div>
+   </div> <!-- /row -->
  </section>
  
  
@@@ -875,6 -943,30 +903,30 @@@
    <h2>Fixed topbar</h2>
    <div class="topbar-wrapper" style="z-index: 5;">
      <div class="topbar">
 -<<<<<<< .merge_file_CXRuoN
+       <div class="container">
+         <h3><a href="#">Project Name</a></h3>
+         <ul>
+           <li class="active"><a href="#">Home</a></li>
+           <li><a href="#">Link</a></li>
+           <li><a href="#">Link</a></li>
+           <li><a href="#">Link</a></li>
+         </ul>
+         <form action="">
+           <input type="text" placeholder="Search" />
+         </form>
+         <ul class="nav secondary-nav">
+           <li class="menu">
+             <a href="#" class="menu">Dropdown</a>
+             <ul class="menu-dropdown">
+               <li><a href="#">Secondary link</a></li>
+               <li><a href="#">Something else here</a></li>
+               <li class="divider"></li>
+               <li><a href="#">Another link</a></li>
+             </ul>
+           </li>
+         </ul>
+ =======
++>>>>>>> .merge_file_ugVE3k
        <div class="fill">
          <div class="container fixed">
            <h3><a href="#">Project Name</a></h3>
@@@ -1165,11 -1267,11 +1226,7 @@@ Lorem ipsum dolar sit amet illo error <
                </div>
              </div>
            </div>
--<<<<<<< HEAD
            <img class="large-bird" src="assets/img/bird.png" width="220px" height="145px">
--=======
--          <img class="large-bird" src="assets/img/bird.png" width="220px" height="151px">
-->>>>>>> 842ad01fce710c50dc9c0174ab790f91e66c46b1
          </div>
        </div>
      </div>

diff --cc lib/forms.less
index 3a847ae841488752a846e3c2ef86fe239ef2edd5,cd5cffc31602e2aeb1d733a572aabb432fad0e54..d528bcd3f3a626920ece6a13cb8b0fc49b45f3c6
--- 1/lib/forms.less
--- 2/lib/forms.less
+++ b/lib/forms.less
@@@ -342,6 -342,13 +342,13 @@@ form.form-stacked 
        }
      }
    }
 -  div.error {
++  .error {
+     padding-top: 10px;
+     padding-bottom: 10px;
+     padding-left: 10px;
+     margin-top: 0;
+     margin-left: -10px;
+   }
    .actions {
      margin-left: -20px;
      padding-left: 20px;