Many things. Server has more functionality. Client works better. Game is completely functional except for untracked bugs.
Fixed merge conflicts and reverted some debug code.