joystick fix
Merge branch 'master' into McLeodLaptop
bug fix
update
Bringing client up to date
Shop works
small bug
update client, shop implementation