Added main stuff
joystick init
extra joystick stuff
joystick stuff 2
fixed content
Merge remote-tracking branch 'zack/master'
merge errors?