Finally working
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com.project.two/ApplicationServer.java
	src/com.project.two/ClientHandler.java