Smara's version with little improvements - added the ports to the properties file
Smara's version with little improvements - added the ports to the properties file
Merge remote-tracking branch 'origin/Marek'

Conflicts:
	public/CA1.jar
	public/chatLog.txt
	public/chatLog.txt.1
	public/index.html
	server.properties
	src/presentation/SwingGUI.java
	src/webserver/WebServer.java
Merge remote-tracking branch 'origin/Marek'