<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -4,27 +4,17 @@
 	&lt;title&gt;Trey Piepmeier's Logbook&lt;/title&gt;
 	&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=utf-8&quot;&gt;
 	&lt;!-- &lt;meta name=&quot;description&quot; content=&quot;ADD A DESCRIPTION OF THIS WEBSITE&quot;&gt; --&gt;
-	&lt;style type=&quot;text/css&quot; media=&quot;screen&quot;&gt;
-		body { background: #878787; }
-		form input[type=search] { color: #888; width: 200px; }
-	&lt;/style&gt;
+	&lt;link rel=&quot;stylesheet&quot; href=&quot;css/reset.css&quot; type=&quot;text/css&quot; media=&quot;screen&quot;&gt;
+	&lt;link rel=&quot;stylesheet&quot; href=&quot;css/base.css&quot; type=&quot;text/css&quot; media=&quot;screen&quot;&gt;
 &lt;/head&gt;
 &lt;body&gt;
 	&lt;div id=&quot;wrapper&quot;&gt;
 		&lt;div id=&quot;header&quot;&gt;
-		&lt;/div&gt;&lt;!-- #header --&gt;
-		&lt;div id=&quot;main&quot;&gt;
-			&lt;!-- &lt;select name=&quot;categories&quot; id=&quot;categories&quot; onchange=&quot;&quot; size=&quot;1&quot;&gt;
-				&lt;option value=&quot;&quot;&gt;View all tags&lt;/option&gt;
-				&lt;option value=&quot;1&quot;&gt;PHP&lt;/option&gt;
-				&lt;option value=&quot;2&quot;&gt;Rails&lt;/option&gt;
-				&lt;option value=&quot;3&quot;&gt;Django&lt;/option&gt;
-			&lt;/select&gt; --&gt;
 			&lt;form action=&quot;search&quot; method=&quot;get&quot; accept-charset=&quot;utf-8&quot;&gt;
 				&lt;div&gt;&lt;input class=&quot;search&quot; type=&quot;search&quot; name=&quot;some_name&quot; value=&quot;Search&quot; id=&quot;some_name&quot;&gt;&lt;/div&gt;
-
-				&lt;div&gt;&lt;input type=&quot;submit&quot; value=&quot;Continue &amp;rarr;&quot;&gt;&lt;/div&gt;
 			&lt;/form&gt;
+		&lt;/div&gt;&lt;!-- #header --&gt;
+		&lt;div id=&quot;main&quot;&gt;
 			&lt;div id=&quot;primary&quot;&gt;
 				&lt;h1&gt;Title of Page&lt;/h1&gt;
 			&lt;/div&gt;&lt;!-- #primary --&gt;</diff>
      <filename>public/static/index.html</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>3c97d132a924c38d09663219ca59da15fa3257ab</id>
    </parent>
    <parent>
      <id>c80fdaf14fb450f11218dc7244e34c8ddbec3674</id>
    </parent>
  </parents>
  <author>
    <name>Trey Piepmeier</name>
    <email>trey@sitening.com</email>
  </author>
  <url>http://github.com/trey/logbook/commit/e4cd9fab82663da3e3d7bdad6fcc639d7430fcd4</url>
  <id>e4cd9fab82663da3e3d7bdad6fcc639d7430fcd4</id>
  <committed-date>2008-07-04T16:44:09-07:00</committed-date>
  <authored-date>2008-07-04T16:44:09-07:00</authored-date>
  <message>Fixing conflicts.</message>
  <tree>33bfbec06dac59939918011145e8798fffecfea9</tree>
  <committer>
    <name>Trey Piepmeier</name>
    <email>trey@sitening.com</email>
  </committer>
</commit>
