merging MikhailServer and AndrewServer
merging branches
merging branches
merging branches
test
minor updates
Merge branch 'MikhailServer' of https://github.com/TheDizzler/space-union into AndrewServer
Merge branch 'AndrewServer' of https://github.com/TheDizzler/space-union into MikhailServer