commitbeforemerge
Merge branch 'master' of https://github.com/YoX89/Pathogenum.git

Conflicts:
	Pathogenum/src/client/ClientMonitor.java
	Pathogenum/src/client/ClientOutputThread.java