resolve merge conflict

yay fancy planet code, but not tested :(

other players added, we'll see if it works

earth theoretically implemented

adding player is pain

yay broken, player initialization

update frontend

physics engine start

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/)

rename to manager.rs

fixup

fix the client

fix SLP

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?