Rebase master as true master.

I had started a new feature on master. This is not how it should be done
and I am now atoning for my mistakes.

clock.php

@@ -109,14 +109,13 @@
         <br/>
         <label for="originalTZ">Display original timezone</label>
         <input type="checkbox" name="originalTZ" value="origTZ">
-        <span class="chkbox>
+        <span class="chkbox">
           <label for="displayOffset">Display offset of selected timezones</label>
           <input type="checkbox" name="displayOffset" value="disOS"/>
         </span>
       </form>
       <p id="JStz"><?php echo date("e");?></p>
-      <h3>Timer</h3>
-      <a href="timer/" title="The timer page">Timer</a>
+      
     </div><!--end of "body" div-->
   </body>
 </html>