Added a second joystick and got the buttons to work.
Merge branch 'master' of https://github.com/raystubbs/Android-Driverstation