Removed chat demo from readme and leftover merge conflict

README.md

@@ -1,15 +1,10 @@
-## Check out the new chat functionality!
-![alt text](./Screenshot%202015-12-07%2022.17.45.png "chat functionality")
-
 ## An intuitive collaborative drawing web based tool.
 Collaborative real-time drawing, sketching & painting
 
 Fast, light weight, easy to maintain.  Try the [demo] (http://draw.etherpad.org).
 
 Demo
 ----
-[Etherdraw with chat demo](http://anarchistseeksmonarchist.com/whiteboard.html)
-----
 [Etherdraw Demo site](http://draw.etherpad.org)
 
 Installation

server.js

@@ -171,11 +171,7 @@ io.sockets.on('connection', function (socket) {
   });
 
   //User sends a chat message
-<<<<<<< HEAD
-    socket.on('chat:message', function(room, uid, message, name){
-=======
   socket.on('chat:message', function(room, uid, message, name){
->>>>>>> comments on sendchatmessage
       draw.chatMessage(room, uid, message, name);
       io.sockets.in(room).emit('chat:message', uid, message, name);
   });