added adding controls
merged dev_LA into dev_NL
Xbox nonsensery
Can now select weight class (sort of), joystick now fully supported.
Multiplayer mumbo jumbo
merged yolo
merged swag
Merge branch 'dev' into dev_AO