Made the chatlog and displayed it on the web server
Merge remote-tracking branch 'origin/Smara'

Conflicts:
	public/CA1.jar
	public/index.html
	src/webserver/WebServer.java