Server and client
Client and server
Merge branch 'master' of github.com:josebui/cargame

Conflicts:
	car-game/src/cargame/sync/GameSync.java