fixed merge conflicts

static/css/pad.css

@@ -1138,14 +1138,6 @@ width:33px !important;
   display:none;
 }
 
-#showhistorylabel{
-  position:absolute;
-  left:58px;
-  top:4px;
-  cursor: hand;
-  cursor: pointer;
-}
-
 #online_count{
   color: #999;
 }

static/js/chat.js

@@ -44,13 +44,6 @@ var chat = (function()
         });
       });
     },
-    showHistory: function()
-    {
-      // this is a placeholder for the showHistory function
-      // load the messages from the server
-      // append them to the UI using addMessage
-      self.scrollDown(); // scroll down to the bottom of the chat
-    },
     hide: function () 
     {
       $("#chatcounter").text("0");

static/pad.html

@@ -244,10 +244,7 @@ Use this link to share a read-only version of your pad:<input id="readonlyInput"
 </div>
 
 <div id="chatbox">
-  <div id="titlebar"><span id="titlelabel">Chat |</span>
-    <a id="showhistorylabel" onClick="chat.showHistory();return false;">Show History</a>
-    <a id="titlecross" onClick="chat.hide();return false;">-&nbsp;</a>
-  </div>
+  <div id="titlebar"><span id ="titlelabel">Chat</span><a id="titlecross" onClick="chat.hide();return false;">-&nbsp;</a></div>
   <div id="chattext" class="authorColors"></div>
   <div id="chatinputbox">
     <form>