Added collision and better sync with server

Collision testing on the client side
Syncing with the server improved