cargo fix

other players added, we'll see if it works

earth theoretically implemented

cargo-fix

adding player is pain

added player (yay) does it work? idk, client broke

yay broken, player initialization

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

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

cleanup

hell is over?

hell pt2

hell