Qq corrections
Merge remote-tracking branch 'origin/master'

Conflicts:
	Servers/src/main/java/Server.java
Qq corrections
Merge remote-tracking branch 'origin/master'