gravity fix
merge
gravity added, client still broken
resolve merge conflict
other players added, we'll see if it works