fix double mutable borrow with replacement

yay broken, player initialization

recv position and planet data on the client

yay merged the file swap (why git why)

haha oops apparently didnt add files (silly me)

merge conflict generator (clean up naming of handler/manager in server/)

fix the client

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Cargo.lock
#	client/src/lib.rs
#	server/src/client_handler.rs
#	server/src/handler.rs
#	server/src/main.rs

SLP

cleanup

hell is over!

hell is over?

hell pt3

hell