Joystick1 working
Merge branch 'temp'