broken code - kek
Merge branch 'master' of https://github.com/Volafile-sekrit-prokekt/MultiTDServer

Conflicts:
	src/io/volafile/multitd/server/Main.java
	src/io/volafile/multitd/server/Server.java