this stuff is bad
Merge branch 'master' of https://github.com/YoX89/Pathogenum.git

Conflicts:
	Pathogenum/src/client/InputThread.java