Trying to merge with Tomoes Branch
Http server created - can read logfile
Trying this in order to commit

no change to program
Merge remote-tracking branch 'origin/Tomoe_R' into Httpserver

Conflicts:
	chatLog.txt
	src/echoserver/EchoServer.java
Http server created - can read logfile
Http server created - can read logfile
Http server created - can read logfile
Small change to index.html
Stop uploading the damn log
Http server created - can read logfile
Small change to index.html
Merge origin/NEwmergeProblems into NEwmergeProblems
HTTP server kan show onlnie users using Singleton in chat server
Merged branches, cleaned up code
Merged branches, cleaned up code