Save some stuff before switch branch

Sorry for so many commits...
Merge remote-tracking branch 'origin/Testing'

Conflicts:
	src/code/ServerMain.java

Merging testing branch in