merge
Merge branch 'master' into 'feat/protobuf-protocol' # Conflicts: # server/src/timer.rs
gravity fix
gravity added, client still broken
resolve merge conflict
other players added, we'll see if it works