Merging with andrew
Merge branch 'AndrewServer' of https://github.com/TheDizzler/space-union into MikhailServer
Optimizing server, removing unused classes, fixing minor bugs.
merging with andrew's branch again
Merged my branch with andrew's.
minor bug fixing