Reworked Server.java
Merge branch 'master' of github.com:danailbd/JavaCore