Merging some stuff because I screwed something up.

Author: nicksloan

css/style.css

@@ -451,6 +451,7 @@ table.schedule td.break {
 
 table.schedule td.registration {
     background-color: #fff48e;
+<<<<<<< HEAD
 }
 
 table.schedule tbody tr.highlight {
@@ -460,5 +461,11 @@ table.schedule tbody tr.highlight {
 table.schedule tr.highlight td.hour,
 table.schedule tr.highlight td.minute {
     background-color: transparent;
+=======
+}
+
+table.schedule tbody tr.highlight {
+    background-color: #99ffcc;
+>>>>>>> d50c2d1bcca6da67073e09192ec7cc86de0a8962
 }
 

resources/schedule.html

@@ -94,7 +94,7 @@ <h1>PHP Community
                     <tr>
                         <td class="minute">45</td>
                     </tr>
-                    <tr>
+                    <tr class="highlight">
                         <td rowspan="4" class="hour">13</td>
                         <td class="minute">00</td>
                         <td rowspan="4" colspan="2" class="lunch">Lunch</td>