diff --git a/README.md b/README.md
index 604078a..8be9f26 100755
--- a/README.md
+++ b/README.md
@@ -3,16 +3,16 @@ This is a simple ajax chat system with a very small footprint on web servers. we
 
 Requirements:
         PHP 5.2+
-        telnet (IRC backend)
-        Read-Write access for .webirc.log and .webirc.input (server side stuffs)
+        Read-Write access for working directory
 
 Installation:
         ~Download webirc-client
         ~Extract it to desired web server / htdocs directory
-        ~Customize config.php / webirc.conf to your likings
+        ~Customize config.php to your liking
         ~Use it!
 
 Changelog:
+<<<<<<< HEAD
 	v1.3.0:
 		-Add /join commands as well as /msg
 		-Some security fixes
@@ -20,12 +20,19 @@ Changelog:
 		-Channel input boxes for login
 		-IRC client bugfixes (irc.php)
 	v1.0.1:
+=======
+    v1.2.0:
+        -Server backend rewrite, all now using PHP and socket_connect / socket_recv / socket_write
+        -Server.php cleanup. 
+        -Simple ping / pong between irc.php and the ajax web client (disconnect user if user not active after 10s)
+
+    v1.0.1:
+>>>>>>> a4294cfa574a866d5725c999aff08bf371c51a46
 		-Add message, and server activity timestamps to chat logs.
 
-        v1.0.0:
-                -Probably going to do something with it!
-                -Functioning as a bash / php based IRC web client!
+    v1.0.0:
+        -Probably going to do something with it!
+        -Functioning as a bash / php based IRC web client!
 
 Legal stuff:
-        webirc-client is based from microchat and has been greatly modified for this project.
         License: GPLv2
diff --git a/server.php b/server.php
index 3822e00..11015a0 100755
--- a/server.php
+++ b/server.php
@@ -15,6 +15,10 @@ include_once("config.php");
 
 session_start();
 
+if(isset($_GET['msg'])) {
+	doLog("Msg information: " . $_GET['msg']);
+}
+
 $channel = $_SESSION['cwchat-channel'];
 
 // If we have a message; grab user and content and push to IRC client