Merge remote branch 'origin/master'

Author: scottjehl

docs/content/content-grids.html

@@ -80,7 +80,7 @@ <h2>Three-column grids</h2>
 	&lt;div class=&quot;ui-block-a&quot;&gt;Block A&lt;/div&gt;
 	&lt;div class=&quot;ui-block-b&quot;&gt;Block B&lt;/div&gt;
 	&lt;div class=&quot;ui-block-c&quot;&gt;Block C&lt;/div&gt;
-&lt;/div&gt;&lt;!-- /grid-a --&gt;
+&lt;/div&gt;&lt;!-- /grid-b --&gt;
 </code></pre>
 
 		<p>This will produce a 33/33/33% grid for our content.</p>